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