fix CHANGES.txt
Merge CHANGES.txt from 2.1.0
fix CHANGES.txt
Merge branch 'cassandra-2.1' into trunk