7415870d13
(cherry picked from commit 0f708d465fbc4260f2c36e8067e27cd8b285fde7) (cherry picked from commit 433212ef878205b0c14e940dd660d1a6e8dc0238) Conflicts: hadoop-yarn-project/CHANGES.txt