Fix CRR test

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7726
Merge branch 'cassandra-2.0' into cassandra-2.1.0