HDFS-4635. Merge change r1468698 from trunk.

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