HDFS-5020. Merge change r1506424 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1506425 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9762. Merge change r1506428 from branch-2.

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