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