HDFS-6235. Merging change r1586696 from branch-2 to branch-2.4

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