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