HDFS-6411. Merging change r1597896 from branch-2

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