svn merge -c  1530669 merging from trunk to branch-2 to fix HDFS-4510.

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