613a783380
(cherry picked from commit 674c7ef64916fabbe59c8d6cdd50ca19cf7ddb7c) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java