Contributed by Subru Krishnan and Carlo Curino. (cherry picked from commit c8212bacb1b2a7e6ee83cc56f72297465ce99390) Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit ebf4aae60f7a641ac7406e27d43528cace20d4ff) Conflicts: hadoop-yarn-project/CHANGES.txt