BUG-15499 service provider to move to ContainerLauncher