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