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