Always reject inequality on the partition key without token()

patch by blerer; reviewed by slebresne for CASSANDRA-7722
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1