svn merge -c 1490803 Merging from trunk to branch-2.1.0-bata to fix HDFS-4832.

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