(cherry picked from commit 561abb9fee5f57f74c2b5868a065b818678622fa) (cherry picked from commit 3efbde5378d73667b3fb53be656ccf108f6dd2fb) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 561abb9fee5f57f74c2b5868a065b818678622fa) (cherry picked from commit 3efbde5378d73667b3fb53be656ccf108f6dd2fb) Conflicts: hadoop-yarn-project/CHANGES.txt