Fix tests post-#5121
Merge branch 'cassandra-1.2' into trunk