Make sure cql-test only run CQLTester ones
Merge branch 'cassandra-2.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1.0