Merge -r 1233089:1233090 from trunk to branch. FIXES: MAPREDUCE-3582

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