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