CASSANDRA-7635, rebase for 2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1