Reduce likelihood of contention on local paxos state locking

Patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for CASSANDRA-7359
Merge branch 'cassandra-2.1' into trunk