(cherry picked from commit 7faa406f27f687844c941346f59a27a375af3233) (cherry picked from commit 2f5435acbda53470724d833cfa1c58dc3c3c9bb1) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 7faa406f27f687844c941346f59a27a375af3233) (cherry picked from commit 2f5435acbda53470724d833cfa1c58dc3c3c9bb1) Conflicts: hadoop-yarn-project/CHANGES.txt