Additional test for 6561 (for 2i)
Merge branch 'master' of github.com:riptano/cassandra-dtest