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