HDFS-4768. Merge 1476579 from trunk.

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

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476588 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-9016-branch-2-gd