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