group_subscription-3249169: fix for non-existent service entity.manager
Update references to non-existent entity.manager service - replacing each instance with entity_type.manager
Update references to non-existent entity.manager service - replacing each instance with entity_type.manager