Make CPRR more robust to failures.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6302
Merge branch 'cassandra-1.2' into cassandra-2.0
fix build