--- old/src/share/vm/runtime/arguments.cpp	2016-06-03 17:55:57.390547700 -0700
+++ new/src/share/vm/runtime/arguments.cpp	2016-06-03 17:55:57.074550700 -0700
@@ -3265,7 +3265,7 @@
           "ManagementServer is not supported in this VM.\n");
         return JNI_ERR;
 #endif // INCLUDE_MANAGEMENT
-    } else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
+	} else if (match_option(option, "-XX:", &tail)) { // -XX:xxxx
       // Skip -XX:Flags= and -XX:VMOptionsFile= since those cases have
       // already been handled
       if ((strncmp(tail, "Flags=", strlen("Flags=")) != 0) &&
@@ -3275,7 +3275,7 @@
         }
       }
     // Unknown option
-    } else if (is_bad_option(option, args->ignoreUnrecognized)) {
+	} else if (is_bad_option(option, args->ignoreUnrecognized)) {
       return JNI_ERR;
     }
   }
@@ -3545,6 +3545,11 @@
     return JNI_ERR;
   }
 
+  if (!FLAG_IS_DEFAULT(FSDirForHeap)) {
+    FLAG_SET_CMDLINE(bool, ForceNUMA, false);
+    FLAG_SET_CMDLINE(bool, UseNUMA, false);
+  }
+
   return JNI_OK;
 }