Update changes
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Non-droppable verbs shouldn't be dropped from OTC

patch by jasobrown; reviewed by Richard Low for CASSANDRA-6980
Merge remote-tracking branch 'apache/cassandra-1.2' into cassandra-2.0
Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1
Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.0' into cassandra-2.1

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