SERVER-13645 reorg Consensus (no functional change)
Merge remote-tracking branch 'upstream/master'