svn merge -c 1498672 Merging from branch-2 to branch-2.1-beta to fix HDFS-4888.

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