merge MAPREDUCE-2129 to branch-1.1

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