Don't swap max/min column names when mutating sstable metadata.

Patch by marcuse; reviewed by benedict for CASSANDRA-7596.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Switch liveRatio-related log messages to DEBUG

ninja-patch by Aleksey Yeschenko for CASSANDRA-7467
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Revert "Fail to start if commit log replay encounters an exception"

This reverts commit 581ce631026b98ee9438d54ef144df89bc91100b.
Handle KeyboardInterrupt properly in cqlsh

Patch by Jordon Pittier, reviewed by brandonwilliams for CASSANDRA-5481
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

Conflicts:
	CHANGES.txt
fix broken merge
Handle paged results in cqlsh

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7625
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
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
Improve cqlsh waiting for a trace to complete

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