Fixes for speculative retry
patch by ayeschenko and jbellis for CASSANDRA-5932
Merge branch 'cassandra-2.0' into trunk