(cherry picked from commit 8c180a13c82ab9d60f595e6942e35d51024dab53) Conflicts: hadoop-yarn-project/CHANGES.txt