HHH-8923 - Reconsider closing of ServiceRegistry instances