Backport CASSANDRA-6747

patch by yukim; reviewed by krummas for CASSANDRA-7560
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Remove shuffle/taketoken.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Remove shuffle/taketoken

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh