Fix potential NPE while loading paxos state

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