ea67e1f266
(cherry picked from commit 735fce5bec17f4e1799daf922625c475cf588114) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java