Ninja-in OperationType.COUNTER_CACHE_SAVE
Merge branch 'cassandra-2.1' into trunk
Post-CASSANDRA-6945 tweak
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
Merge branch 'cassandra-2.1' into trunk