update test for separate paxos/commit CLs
fix CAS contention timeout
patch by Soumava Ghosh; reviewed by jbellis for CASSANDRA-5830