HDFS-5307. Merging change r1530033 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.2@1530126 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5317. Merging change 1530117 from branch-2

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