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