HADOOP-10148. backport hadoop-10107 to branch-0.23 (Chen He via jeagles)

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