HDFS-6581. Update CHANGES.txt in preparation for trunk merge