HDFS-5844. Merging -r1562358 from branch-2 to branch-2.3

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