fix conditional ddl assertions and restrict one test to 2.1+
Merge branch 'master' of https://github.com/riptano/cassandra-dtest