HDFS-4546. Merging 1r1454021 and r1454027 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454235 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4569. Merge r1454233 from trunk

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