Reverting r1615804 (HDFS-6717) from branch-2.5

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1616032 13f79535-47bb-0310-9956-ffa450edef68
Reverting r1615705 (HADOOP-10759) from branch-2.5

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