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