HADOOP-10031. Merging change r1530827 from branch-2 to branch-2.2

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

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