svn merge -c 1534832 FIXES: MAPREDUCE-5561. org.apache.hadoop.mapreduce.v2.app.job.impl.TestJobImpl testcase failing on trunk. Contributed by Karthik Kambatla


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1534840 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-0.23' into branch-0.23-gd
Merge remote branch 'origin/branch-0.23-gd' into fb-HADOOP-9166-branch-0.23-gd