svn merge -c 1519681 merging from trunk to branch-2.1 to fix HDFS-5150.

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