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