MAPREDUCE-6142. Fixed test failures in TestJobHistoryEventHandler and TestMRTimelineEventHandling. Contributed by Zhijie Shen.

(cherry picked from commit 3f1441245db047b5b7289fe06c4c3306fe8189af)