HDFS-5748. Merging change r1560215 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560216 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5434. Merging r1560217 from trunk to branch-2

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