make cli comparator-aware and improve quote rules. patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-1523 and CASSANDRA-1524