Fix CHANGES.txt
Merge branch 'cassandra-2.1' into trunk