fix merge of 7519
Merge branch 'cassandra-2.1' into trunk