HDFS-5382. Merge change r1534368 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534374 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5347. Merging change r1534377 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/branch-2' into branch-2-gd