34dd2d1d1c
(cherry picked from commit 9e40de6af7959ac7bb5f4e4d2833ca14ea457614) Conflicts: hadoop-yarn-project/CHANGES.txt