cqlsh: fix CONSISTENCY output

Patch by Adam Holmberg; reviewed by Tyler Hobbs for CASSANDRA-8507
Merge branch 'cassandra-2.1' into trunk