SCOUT-91 Organize the imports - we had been calling in the v3 ObjectFactory in both cases in RegistryV3Impl.