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