fix CLTest post-#6764
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6764
Merge branch 'cassandra-2.1' into trunk