Fix changelog
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Add support for custom 2i validation
patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575