Issue #2351729: Rename container to service_container.