Merge remote-tracking branch 'origin/JDK-8300658' into JDK-8300658

# Conflicts:
#	src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

Author: RadekCap

src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

@@ -164,7 +164,7 @@ char* CgroupV2Subsystem::mem_soft_limit_val() {
 // without also setting a memory limit is not allowed.
 jlong CgroupV2Subsystem::memory_and_swap_limit_in_bytes() {
   char* mem_swp_limit_str = mem_swp_limit_val();
-  if (mem_swp_limit_str == NULL) {
+  if (mem_swp_limit_str == nullptr) {
     // Some container tests rely on this trace logging to happen.
     log_trace(os, container)("Memory and Swap Limit is: %d", OSCONTAINER_ERROR);
     // swap disabled at kernel level, treat it as no swap