svn merge -c -1354790 for reverting HDFS-3576 since it requires more changes.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354792 13f79535-47bb-0310-9956-ffa450edef68
12 files changed