merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. (Contributed by Sandy Ryza)