35a5b8929e
(cherry picked from commit 5b7078d06921893200163a3d29c8901c3c0107cb) Conflicts: hadoop-yarn-project/CHANGES.txt