(cherry picked from commit 6cb0af3c39a5d49cb2f7911ee21363a9542ca2d7) (cherry picked from commit a1a723fdffee44be9a5d2a1ced896442a5318375) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 6cb0af3c39a5d49cb2f7911ee21363a9542ca2d7) (cherry picked from commit a1a723fdffee44be9a5d2a1ced896442a5318375) Conflicts: hadoop-yarn-project/CHANGES.txt