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