Change-Id: I363c4ffcac32116ddcdc0a22fac3db92f14a0db0 Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt