Fix CASSANDRA-6075

patch by Aleksey Yeschenko and Benjamin Lerer
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/cql3/SelectWithTokenFunctionTest.java
Merge branch 'cassandra-2.1' into trunk
Trunk Test fixes

Patch by Carl Yeksigian; reviewed by tjake for CASSANDRA-7991