(cherry picked from commit 855d52927b6115e2cfbd97a94d6c1a3ddf0e94bb) (cherry picked from commit 1d107d805841e9b39db01aa236068a0ff1ca46d1) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalResourcesTrackerImpl.java