Fix potential deadlock in the native protocol

patch by slebresne; reviewed by jbellis for CASSANDRA-5926
Merge branch 'cassandra-1.2' into cassandra-2.0.0