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
Load user types at the right place
Fix reading expired row value from row cache
patch by jbellis; reviewed by Mikhail Stepura for CASSANDRA-6325
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Improve Gossip tolerance of abnormally slow tasks
patch by jbellis; reviewed by jasobrown for CASSANDRA-6338
Merge branch 'cassandra-2.0' into trunk
Fix paging with reversed slices

patch by slebresne; reviewed by iamalesksey for CASSANDRA-6343
Merge branch 'cassandra-2.0' into trunk
Set minTimestamp correctly to be able to drop expired sstables correctly

patch by marcuse, reviewed by jbellis for CASSANDRA-6337
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' of https://github.com/apache/cassandra into trunk
Merge branch 'trunk' of https://github.com/eric-wu/cassandra into trunk