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