(cherry picked from commit 1ba31fe9e906dbd093afd4b254216601967a4a7b) 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 1ba31fe9e906dbd093afd4b254216601967a4a7b) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/native/container-executor/test/test-container-executor.c