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