Issue #2783465 by arpieb, KarenS: Extend service classes with ServiceProviderBase so thay can be overridden via alter