Fix saving caches when a table is dropped

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-7784
Metrics for prepared stmt usage and eviction

Patch by Robbie Strickland; review by Tyler Hobbs for CASSANDRA-7930
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/metrics/CqlStatementMetrics.java
Revert "Metrics for prepared stmt usage and eviction"

This reverts commit 19c6cc1982d2146a99ccaf6dccc087fe88d5785f.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
cassandra-stress: fix support for NetworkTopologyStrategy

patch by benedict; reviewed by yukim for CASSANDRA-7945
Invalidate prepared stmts when ks or table is dropped

Patch by Viju Kothuvatiparambil; review by Tyler Hobbs for
CASSANDRA-7566
Prevent NPE on FD conviction race

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7940
Make repair -pr work with -local

patch by Paulo Motta; reviewed by yukim for CASSANDRA-7450
Add CASSANDRA-7450 to CHANGES
Merge branch 'cassandra-2.0' into cassandra-2.1
Follow up to CASSANDRA-7719

patch by Aleksey Yeschenko; reviewed by Jake Luciani for CASSANDRA-7719
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
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
Provide visibility into prepared statements churn

patch by Nate McCall; reviewed by Aleksey Yeschenko for CASSANDRA-7921
Allow permissions cache to be set via JMX

Patch by brandonwilliams, reviewed by aleksey for CASSANDRA-7968
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
rm dead code