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
savepoint ...
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
Merge remote-tracking branch 'origin/trunk' into 8053-udaf-v2

Conflicts:
	src/java/org/apache/cassandra/cql3/functions/Functions.java
	src/java/org/apache/cassandra/cql3/functions/JavaSourceUDFFactory.java
	src/java/org/apache/cassandra/cql3/functions/UDFunction.java
	src/java/org/apache/cassandra/cql3/statements/CreateFunctionStatement.java