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