Avoid special casing received/expected counts in CAS timeout exceptions

patch by slebresne; reviewed by jbellis for CASSANDRA-6595
Merge branch 'cassandra-2.0' into trunk