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