MAPREDUCE-5710. Backport MAPREDUCE-1305 to branch-1 (Yongjun Zhang via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1556372 13f79535-47bb-0310-9956-ffa450edef68