Fix CRR/test, one more time

Patch by Jeremiah Jordan, reviewed by brandonwilliams for CASSANDRA-7726
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1