Backport json2sstable range tombstone fix from 2.0
Merge branch 'cassandra-1.2' into cassandra-2.0

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