Reverting HDFS-5307 & HDFS-5317 from branch-2.2.0 since rc0 for hadoop-2.2.0 is already out.

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