fix merge
Merge branch 'cassandra-2.0' into cassandra-2.1
fix merge
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/Keyspace.java
	src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java