Update changes
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