*** old/src/hotspot/os/linux/globals_linux.hpp	Tue Oct 24 13:04:47 2017
--- new/src/hotspot/os/linux/globals_linux.hpp	Tue Oct 24 13:04:46 2017

*** 57,66 ****
--- 57,69 ----
            "Load DLLs with executable-stack attribute in the VM Thread") \
                                                                          \
    product(bool, UseSHM, false,                                          \
            "Use SYSV shared memory for large pages")                     \
                                                                          \
+   product(bool, UseContainerSupport, true,                              \
+           "Enable detection and runtime container configuration support") \
+                                                                         \
    diagnostic(bool, UseCpuAllocPath, false,                              \
               "Use CPU_ALLOC code path in os::active_processor_count ")
  
  //
  // Defines Linux-specific default values. The flags are available on all