svn merge -c 1520964 FIXES: MAPREDUCE-5414. TestTaskAttempt fails in JDK7 with NPE. Contributed by Nemon Lou


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1531068 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-7435-branch-0.23-gd