HDFS-5370. Merge 1532902 from branch-2

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

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