svn merge -c 1467061 FIXES: MAPREDUCE-5136. TestJobImpl->testJobNoTasks fails with IBM JAVA. Contributed by Amir Sanjar


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