svn merge -c 1536724 FIXES: MAPREDUCE-5598. TestUserDefinedCounters.testMapReduceJob is flakey. Contributed by Robert Kanter


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