CASSANDRA-7635, rebase for 2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix minor potential leak in sstable2json

patch by blerer; reviewed by slebresne for CASSANDRA-7709
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/tools/SSTableExport.java
Avoid logging CompactionInterrupted at ERROR
patch by marcuse; reviewed by jbellis for CASSANDRA-7694
merge from 2.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/tools/SSTableExport.java
merge from 2.1.0
merge
Fix potential AssertionError with 2ndary indexes

patch by slebresne; reviewed by beobal for CASSANDRA-6612
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/AbstractSimplePerColumnSecondaryIndex.java
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix pig tests.

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-7570
Merge branch 'cassandra-2.0' into cassandra-2.1
Better messaging on URI failure on cassandra.config
Patch by Josh McKenzie; review by Lyuben Todorov for CASSANDRA-7398
Workaround for netty issue causing corrupted data to come off the wire

patch by tjake, test by Johan Bjork; reviewed by belliottsmith for (CASSANDRA-7695)
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Validate arguments of blobAs functions

patch by slebresne; reviewed by thobbs for CASSANDRA-7707
Fix potential AssertionError in RangeTombstoneList

patch by slebresne; reviewed by thobbs for CASSANDRA-7700
Version and licenses for 2.0.10 release