Fix test failures for CASSANDRA-5175
Merge branch 'cassandra-1.2' into trunk
Fix test failures for CASSANDRA-5175
Merge branch 'cassandra-1.2' into trunk