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