HDFS-5335. Merge 1531153 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.2@1531154 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10039. Merge change r1531159 from branch-2.

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