CASSANDRA-6742 follow up
Merge branch 'cassandra-2.1' into trunk