Make the CL native protocol code match the on in 2.0

patch by slebresne; reviewed by jasobrown for CASSANDRA-6347