Don't increment vector-clock on merge and merge locally. See #3076

So there are some measurements added to the ticket.

Overall it looks good. We send a little bit more gossip messages but we don't have the explosion of messages that we had before.