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