Merge -c 1196977 from trunk to branch-0.23.0 to fix MAPREDUCE-3337.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23.0@1196979 13f79535-47bb-0310-9956-ffa450edef68
12 files changed