svn merge -c 1452978 Merging from trunk to branch-2 to fix HDFS-4542.

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

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

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