Fix changelog
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix warnings for _ as identifier
patch by Robert Stupp; reviewed by jbellis for CASSANDRA-7675
Add support for custom 2i validation
patch by Sergio Bossa and Andrés de la Peña for CASSANDRA-7575
merge from 2.1