cleanup paxos tracing
fix re-propose of earlier, incomplete paxos round to use new ballot
patch by jbellis; reviewed by slebresne for CASSANDRA-5985
Merge branch 'cassandra-2.0' into trunk