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