Fix stress with CQL3
Merge branch 'cassandra-1.2' into trunk