Fix CRR, add pig test for it

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7726