svn merge -c 1341961 Merging from trunk to branch-0.23 to fix HDFS-3436.

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