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