FELIX-4977 Fix for concurrency issue with factory services This commit fixes the issue in nearly all cases. Very occasionally the testGetUngetServiceFactory() test still reports 1 violation (down from the hundreds we were getting).