*** old/src/hotspot/share/runtime/globals.hpp	Wed Oct 11 14:34:57 2017
--- new/src/hotspot/share/runtime/globals.hpp	Wed Oct 11 14:34:55 2017

*** 2033,2042 ****
--- 2033,2045 ----
                                                                              \
    product_pd(uint64_t, MaxRAM,                                              \
            "Real memory size (in bytes) used to set maximum heap size")      \
            range(0, 0XFFFFFFFFFFFFFFFF)                                      \
                                                                              \
+   product(bool, AggressiveHeap, false,                                      \
+           "Optimize heap optnios for long-running memory intensive apps")   \
+                                                                             \
    product(size_t, ErgoHeapSizeLimit, 0,                                     \
            "Maximum ergonomically set heap size (in bytes); zero means use " \
            "MaxRAM * MaxRAMPercentage / 100")                                \
            range(0, max_uintx)                                               \
                                                                              \

*** 2072,2081 ****
--- 2075,2090 ----
                                                                              \
    product(double, InitialRAMPercentage, 1.5625,                             \
            "Percentage of real memory used for initial heap size")           \
            range(0.0, 100.0)                                                 \
                                                                              \
+   product(intx, ActiveProcessorCount, -1,                                   \
+           "Specify the CPU count the VM should use and report as active")   \
+                                                                             \
+   product(bool, UseContainerSupport, true,                                  \
+           "(Linux Only) Enable detection and runtime container configuration support")   \
+                                                                             \
    develop(uintx, MaxVirtMemFraction, 2,                                     \
            "Maximum fraction (1/n) of virtual memory used for ergonomically "\
            "determining maximum heap size")                                  \
                                                                              \
    product(bool, UseAdaptiveSizePolicy, true,                                \