FELIX-4866 Fix concurrency issue with Service Registry Includes a concurrency test from pderop that exposes the issue. Many thanks Pierre for identifying this problem!