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