Fix json2sstable handling of range tombstones

patch by Lyuben Todorov; reviewed by Aleksey Yeschenko for
CASSANDRA-6316
Fixing missing one row during reverse query on compact tables

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6330
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/tools/SSTableImport.java
Fix missing results on query with IN clauses

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6327
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/tools/SSTableImport.java
Fix build
Merge branch 'cassandra-2.0' into trunk