HDFS-4426. Merge change 1437627 from trunk.

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