svn merge -c 1517982 merging from branch-2 to branch-2.1-beta to fix HDFS-5128.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1517985 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1517989 merging from trunk to branch-2.1-beta to fix HDFS-5132.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1517991 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1517995 Merging from branch-2 to add the new test file for HDFS-3245 that was accidentally dropped.

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