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