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