HDFS-6236. Merging change r1586903 from branch-2 to branch-2.4

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