HADOOP-996 (internal) more changes
HADOOP-2223 (internal) Backport HDFS-3696