Reduce run time for CQL tests

patch by slebresne; reviewed by thobbs for CASSANDRA-7327
Merge branch 'cassandra-2.1' into trunk