better diagnostic of license server discovery problems
Tests for HgMergeProvider  branch merging added.