Add schema_triggers cleanup to SystemKeyspace#finishStartup()
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/SystemKeyspace.java
Add schema_usertypes cleanup to SystemKeyspace#finishStartup()
(Eclipse) Re-use test classes from an ant build

patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
Include ks name in failed streaming error message

Patch by Rajanarayanan Thottuvaikkatumana; reviewed by Tyler Hobbs for
CASSANDRA-8221
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Support for frozen collections

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
Fix help doc on 'nodetool disablehandoff'

CASSANDRA-8294
Fix regression in HadoopCompat from CASSANDRA-7579

Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292
Fix millisecond timestamps in Tracing

patch by Aleksey Yeschenko; reviewed by Sam Tunnicliffe for
CASSANDRA-8297
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tracing/Tracing.java
Disable SSLv3 for POODLE

patch by Jeremiah Jordan; reviewed by jasobrown for CASSANDRA-8265
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/transport/Server.java
	src/java/org/apache/cassandra/transport/SimpleClient.java
ninja-fix nit from casandra-8265 commit (make repeated strings a constant)
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
	src/java/org/apache/cassandra/transport/Server.java
	src/java/org/apache/cassandra/transport/SimpleClient.java
Fix ordering on SSTableScanner / SSTableReader close

Patch by jmckenzie; reviewed by marcuse for CASSANDRA-8019
Fix incremental repair not remove parent session on remote

patch by yukim; reveiwed by krummas for CASSANDRA-8291
add check of the system wall clock time at startup

patch by jasobrown; reviewed by driftx for CASSANDRA-8305
Add more logging to be able to debug what files readMeter can be null for.

Patch by marcuse; reviewed by thobbs for CASSANDRA-8238
Do more aggressive ttl expiration checks to be able to drop more sstables

Patch by Bjorn Hegerfors; reviewed by marcuse and slebresne for CASSANDRA-8243