HDFS-5171. Merging change r1535588 from branch-2

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