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
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
	src/java/org/apache/cassandra/cql3/Cql.g
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selectable.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java