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