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