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