(cherry picked from commit fc6d3a3b234efff2b0b646c31a4e6ff0a5118ef9) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit e09222306f65227d14fe1e656102d225b232409c) Conflicts: hadoop-yarn-project/CHANGES.txt
(cherry picked from commit fc6d3a3b234efff2b0b646c31a4e6ff0a5118ef9) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit e09222306f65227d14fe1e656102d225b232409c) Conflicts: hadoop-yarn-project/CHANGES.txt