Fix NPE when stream requestRanges
Merge branch 'cassandra-2.0' into cassandra-2.1
Add missing part for CASSANDRA-3668
Optimize netty server

Patch by tjake; reviewed by Benedict Elliott Smith for CASSANDRA-6861
assume allNodesAtLeast21 until demonstrated otherwise; see CASSANDRA-7161
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Fix broken build
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	conf/cassandra-env.sh
Merge branch 'cassandra-2.0' into cassandra-2.1
Add snapshot "manifest" describing files included
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6326
don't use o.a.commons.io for one method
Merge branch 'cassandra-2.0' into cassandra-2.1
make sure manifest's parent dirs exist before trying to write the file.
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Fix marking commitlog segments clean
patch by bes; reviewed by jbellis for CASSANDRA-6959