2f18218508
(cherry picked from commit f634505d48d97e4d461980d68a0cbdf87223646d) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestJobConf.java