HADOOP-10110. Merging change r1543196 from branch-2 to branch-2.2

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

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