svn merge -c 1401423 Merging from trunk to branch-0.23 to fix HDFS-2434.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1453627 13f79535-47bb-0310-9956-ffa450edef68