6ca0c134e4
(cherry picked from commit 424887ecb7d11a72837f2757ed3ff9e0fe8c5b5d) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManagerRecovery.java