Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java