(cherry picked from commit 89022f8d4bac0e9d0b848fd91e9c4d700fe1cdbe) (cherry picked from commit 2cbbf76c3dd9570e08914077de8e610d93ee0c9e) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit 89022f8d4bac0e9d0b848fd91e9c4d700fe1cdbe) (cherry picked from commit 2cbbf76c3dd9570e08914077de8e610d93ee0c9e) Conflicts: hadoop-yarn-project/CHANGES.txt