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