JGRP-1805

Add more informative trace logging to the merge tests. This should allow better diagnosing of merge problems (where what happens is split between GMS, MERGE2 and Discovery).

Bela, my editor has auto-formatted a lot of stuff- can you work around these unintended changes?