Test fixups
Test for 6956
Merge branch 'master' of github.com:riptano/cassandra-dtest