svn merge -c 1510581 Merging from trunk to branch-2.1-beta to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1510584 13f79535-47bb-0310-9956-ffa450edef68