Get a lock on the MergeWorker before running the test.  This prevents 1 of 3 possible ways to fail the test.
Keep trying to get lock
Merge pull request #844 from kaysoky/MergeWorkerTestTrace

MergeWorkerTest - Fix #1 (of 3 problems)