Fixes for speculative retry
patch by ayeschenko and jbellis for CASSANDRA-5932