70ac8cda41
(cherry picked from commit 73d9e4c77b2aa4734845376d20fb76e6b91b6db0) Conflicts: hadoop-yarn-project/CHANGES.txt