Backport 6190
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
add cassandra.default_messaging_version
patch by Minh Do; reviewed by jbellis for CASSANDRA-6619
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix ArrayIndexOutOfBoundsException in 2ndary index query

patch by slebresne; reviewed by lyubent for CASSANDRA-6470
Fix ArrayIndexOutOfBoundsException in 2ndary index query

patch by slebresne; reviewed by lyubent for CASSANDRA-6470
Release sstables upon rebuilding 2i

patch by Sergio Bossa; reviewed by Aleksey Yeschenko for
CASSANDRA-6635
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DataRange.java
	src/java/org/apache/cassandra/db/index/SecondaryIndex.java
Add AbstractCompactionStrategy.startup() method

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6637
Merge branch 'cassandra-2.0' into trunk
Move LCS DataTracker subscription to startup()
Merge branch 'cassandra-2.0' into trunk
Handle host id conflicts properly.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6615
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into trunk
Add UTMetaData equals()
revert CASSANDRA-6107, and cut max cached statements to 50k
Merge branch 'cassandra-1.2' into cassandra-2.0