ea2b6ee9e9
(cherry picked from commit b3f6b641dccb0d59df78855e2951d2cae7dff8ad) Conflicts: hadoop-yarn-project/CHANGES.txt