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