Update CHANGES.txt after merging HDFS-6252 and HDFS-6657 to branch-2.