HDFS-6044. Merging change r1574624 from branch-2

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