(cherry picked from commit a2c3bfc8c1349102a7f2bc4ea96b80b429ac227b) (cherry picked from commit 51e448d295f6d2214c1d6455446a8e05e8a967b1) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit a2c3bfc8c1349102a7f2bc4ea96b80b429ac227b) (cherry picked from commit 51e448d295f6d2214c1d6455446a8e05e8a967b1) Conflicts: hadoop-yarn-project/CHANGES.txt