Fix tracing on the new SEPExecutor
patch by jbellis; reviewed by bes for CASSANDRA-7644
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into trunk
Filter cached results correctly.

Patch by marcuse, reviewed aleksey for CASSANDRA-7636
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
remove shuffle bat
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	bin/cassandra-shuffle.bat
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Ninja: remove buggy test assertion from 2.1

This was fixed by CASSANDRA-7390, but that fix starts with Cassandra
3.0.
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	test/unit/org/apache/cassandra/service/MoveTest.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/service/MoveTest.java
add cassandra.in.bat
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Tolerate min/max cell names of different lengths

Patch and review by Jonathan Ellis and Tyler Hobbs for CASSANDRA-7651
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk