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
Don't clear out range tombstones during compaction.

Patch by rlow; reviewed by marcuse for CASSANDRA-7808
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java