HDFS-5067. Merging change r1522776 from branch-2

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

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