Fix paxos not always replaying when it should

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