Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.