Fix tests for 1.2
Merge branch 'master' of github.com:riptano/cassandra-dtest