HDFS-5234. Merging change r1525109 from branch-2

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

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