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