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