Fix non-text comparator col names in cql3 queries

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8178
Merge branch 'cassandra-2.0' into cassandra-2.1