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