Fix SSTableImportTest

patch by blerer; reviewed by azotcsit for CASSANDRA-8181
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Backport CASSANDRA-7386
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Handle abort() properly in SSTableRewriter

Patch by marcuse; reviewed by jmckenzie for CASSANDRA-8320
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
Fix PaxosStateTest
Validate functionality of different JSR-223 providers in UDFs.

patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7874
Support for UDTs, tuples, and collections in UDFs

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7563
Expose off-heap memory usage stats

patch by Benjamin Lerer; reviewed by Aleksey Yeschenko for
CASSANDRA-7897
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/java/org/apache/cassandra/utils/IFilter.java
	src/java/org/apache/cassandra/utils/obs/IBitSet.java
Merge branch 'cassandra-2.1' into trunk
Fix CQLTester

patch by snazy; reviewed by blerer for CASSANDRA-8392
use parameterized logging
don't declare throwing exceptions that aren't
use try-with-resources
Fixed typo

Patch by davedamoon; reviewed by marcuse for CASSANDRA-8395
Merge branch 'cassandra-2.1' into trunk
Increase quarantine on replacement

Patch by brandonwilliams, reviewed by jasobrown for CASSANDRA-8260