*** old/src/hotspot/share/runtime/arguments.cpp	Wed Oct 11 14:34:53 2017
--- new/src/hotspot/share/runtime/arguments.cpp	Wed Oct 11 14:34:52 2017

*** 3352,3367 ****
--- 3352,3361 ----
        _vfprintf_hook = CAST_TO_FN_PTR(vfprintf_hook_t, option->extraInfo);
      } else if (match_option(option, "exit")) {
        _exit_hook = CAST_TO_FN_PTR(exit_hook_t, option->extraInfo);
      } else if (match_option(option, "abort")) {
        _abort_hook = CAST_TO_FN_PTR(abort_hook_t, option->extraInfo);
      // -XX:+AggressiveHeap
      } else if (match_option(option, "-XX:+AggressiveHeap")) {
        jint result = set_aggressive_heap_flags();
        if (result != JNI_OK) {
            return result;
        }
      // Need to keep consistency of MaxTenuringThreshold and AlwaysTenure/NeverTenure;
      // and the last option wins.
      } else if (match_option(option, "-XX:+NeverTenure")) {
        if (FLAG_SET_CMDLINE(bool, NeverTenure, true) != Flag::SUCCESS) {
          return JNI_EINVAL;

*** 3639,3648 ****
--- 3633,3654 ----
        "Use -classpath instead.\n.");
      os::closedir(dir);
      return JNI_ERR;
    }
  
+   // We need to know if we are running in a container
+   // to determine the active processor count and available
+   // memory.
+   os::initialize_container_support();
+ 
+   if (AggressiveHeap) {
+     jint result = set_aggressive_heap_flags();
+     if (result != JNI_OK) {
+       return result;
+     }
+   }
+ 
    // This must be done after all arguments have been processed.
    // java_compiler() true means set to "NONE" or empty.
    if (java_compiler() && !xdebug_mode()) {
      // For backwards compatibility, we switch to interpreted mode if
      // -Djava.compiler="NONE" or "" is specified AND "-Xdebug" was