HADOOP-10030. Merging change r1530465 from branch-2 to branch-2.2

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

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