HDFS-4633. Merging change r1537347 from branch-2 to branch-2.2

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