Merge branches 'paxos' and 'log' into ftlog