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