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