HDFS-5199. Merge change r1524300 from branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1524301 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5212. Merge change r1524302 from branch-2.

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