Prevent NPE on FD conviction race

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940
Merge branch 'cassandra-2.0' into cassandra-2.1
Make repair -pr work with -local

patch by Paulo Motta; reviewed by yukim for CASSANDRA-7450
Merge branch 'cassandra-2.1' into trunk
Support IN clause for any clustering column

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-4762
Add CASSANDRA-7450 to CHANGES
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.1' into trunk
Remove deprecated removetoken command from nodetool
Make assassinate a first class command.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7935
stupid brace
Follow up to CASSANDRA-7719

patch by Aleksey Yeschenko; reviewed by Jake Luciani for CASSANDRA-7719
Merge branch 'cassandra-2.1' into trunk
Fix RowIndexEntry to report correct serializedSize
patch by Pavel Yaskevich; reviewed by Aleksey Yeschenko for CASSANDRA-7948
Merge branch cassandra-2.0 into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Include schema_triggers CF in readable system resources

patch by Adam Holmberg; reviewed by Aleksey Yeschenko for CASSANDRA-7967
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/ClientState.java
Merge branch 'cassandra-2.1' into trunk
Provide visibility into prepared statements churn

patch by Nate McCall; reviewed by Aleksey Yeschenko for CASSANDRA-7921