38853c97c2
(cherry picked from commit 5c14bc426b4be381383018ebc2236be83eef15cd) Conflicts: hadoop-yarn-project/CHANGES.txt