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()
Merge branch 'cassandra-2.1' into trunk
(Eclipse) Re-use test classes from an ant build

patch by Mikhail Stepura; reviewed by T Jake Luciani for CASSANDRA-8277
Merge branch 'cassandra-2.1' into trunk
fix some JDK 8 javadoc lint errors
route sigar's use of log4j thru slf4j
fix license extension
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
Merge branch 'cassandra-2.1' into trunk
Support for frozen collections

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-7859
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/TypeParser.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
Fix help doc on 'nodetool disablehandoff'

CASSANDRA-8294
Merge branch 'cassandra-2.1' into trunk
presize collections
Cleanup and move hardcoded system tables away from CFMetaData

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-8261
Fix regression in HadoopCompat from CASSANDRA-7579

Patch by jmckenzie; reviewed by bwilliams for CASSANDRA-8292
Merge branch 'cassandra-2.1' into trunk