Remove shuffle/taketoken

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix column name serialization for cassandra-stress/stressd

patch by rspitzer; reviewed by benedict for CASSANDRA-7608
Merge branch 'cassandra-2.1' into trunk
Set gc_grace_seconds to 7 days for system schema tables

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7668
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix serialization of command ratios in cassandra-stress/stressd

patch by rspitzer; reviewed by benedict for CASSANDRA-7559
Merge branch 'cassandra-2.1' into trunk
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Fix scrub against collection type

patch by yukim; reviewed by thobbs for CASSANDRA-7665
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
cqlsh: Upgrade bundled py driver to fix nulls in UDTS and tuples

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7656