Fix trying to hint timed out counter writes
patch by jbellis; reviewed by aleksey for CASSANDRA-6322
Merge branch 'cassandra-2.0' into trunk