Don't increment vector-clock on merge and merge locally. See #3076
Fixes according review. See #3076
Merge pull request #1230 from akka/wip-3076-gossip-merge-changes-ban

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