(cherry picked from commit 2aaed1032719e978660d1f14a8ed299e83b5f65e) (cherry picked from commit be50df687bf800d35f418128d0c3f05ab6c429c8) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 2aaed1032719e978660d1f14a8ed299e83b5f65e) (cherry picked from commit be50df687bf800d35f418128d0c3f05ab6c429c8) Conflicts: hadoop-yarn-project/CHANGES.txt