(cherry picked from commit 2ac029b949f041da2ee04da441c5f9f85e1f2c64) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c
(cherry picked from commit 2ac029b949f041da2ee04da441c5f9f85e1f2c64) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c