Consensus: ensure that we improve our message aggregation logic

[wraitii]

• We might try to aggregate incompatible messages when we have enough compatible messages for a quorum
• We might not try all variants
• Both for timeouts and other types of messages
• Add tests