Add test interrupting conflict resolution

We need a test that starts conflict resolution and then crashes a node or starts another merge, to verify that conflict resolution is properly interrupted or restarted as necessary.

HotRodMergeTest was unintentionally testing this by starting the 2nd test before the 1st test's merge finished in all the server caches, but we need something more deterministic in core.