svn merge -c 1461597 Merging from trunk to branch-0.23 to fix HDFS-4581.

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