HDFS-4980. Merge 1502308 and 1502311 from branch-2

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