mon: backport two paxos fixes to firefly