Merge -r 1057805:1057806 from trunk to branch-0.21. Fixes: MAPREDUCE-1929.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/branch-0.21@1057813 13f79535-47bb-0310-9956-ffa450edef68
3 files changed