Fix pig tests.

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6877
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk