(cherry picked from commit 7e4715186d31ac889fba26d453feedcebb11fc70) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 7013f9d6cda88e72a839b1c55757615b55101beb) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 7e4715186d31ac889fba26d453feedcebb11fc70) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit 7013f9d6cda88e72a839b1c55757615b55101beb) Conflicts: hadoop-yarn-project/CHANGES.txt