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