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)
Cleanup of auth services to be neater and less bug-prone.
Fix the tests
Login should actually just check the boolean that gets returned now rather than look for a 403
Prune the number of email messages sent out
Add terms of use shenanigans
Almost forgot to change the transaction around the session token check back to REQUIRED
Further simplifications to the methods
Login should not return UserSessionData, just a Session is fine
Merge pull request #832 from kaysoky/WhackAMole

Auth service revisions