Ninja: adjusted cqlsh tests for CASSANDRA-7857
Merge branch 'cassandra-2.1' into trunk