(cherry picked from commit 446d51591e6e99cc60a85c4b9fbac379a8caa49d) (cherry picked from commit 03af057a477b2a31b66831d66f8a38cff42f2201) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 446d51591e6e99cc60a85c4b9fbac379a8caa49d) (cherry picked from commit 03af057a477b2a31b66831d66f8a38cff42f2201) Conflicts: hadoop-yarn-project/CHANGES.txt