EZP-22465: cleanup: grouped service configuration