EZP-22465: rename WrappedServiceContainer to ServiceContainer