4c6867ff01
(cherry picked from commit 9c5911294e0ba71aefe4763731b0e780cde9d0ca) Conflicts: hadoop-yarn-project/CHANGES.txt