cqlsh doesn't handle LIST statements correctly.

patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-8370
Merge branch 'cassandra-2.1' into trunk