937f739804
(cherry picked from commit 8f1c374bec2451568f463ab68f7eb6db734ab14e) Conflicts: hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMRTimelineEventHandling.java