HDFS-5065. Merging change r1512871 and r1537320 from branch-2 to branch-2.2

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