(cherry picked from commit c1462a67ff7bb632df50e1c52de971cced56c6a3) (cherry picked from commit 1cc001db4c3767072b5d065d161bc5c6d1c480d4) Conflicts: hadoop-yarn-project/CHANGES.txt hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/TestSchedulerApplicationAttempt.java