(cherry picked from commit 0656d2dc83af6a48a8d8d0e37cdf1f813124f366) (cherry picked from commit d76b523b020fcd76e9abdd661967ca4a931d9863) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 0656d2dc83af6a48a8d8d0e37cdf1f813124f366) (cherry picked from commit d76b523b020fcd76e9abdd661967ca4a931d9863) Conflicts: hadoop-yarn-project/CHANGES.txt