Revert "Revert "Issue #2241633 by sun: Simplify site-specific service overrides.""

This reverts commit ecf2fa7296d0640088c6bbf3a8fd7f3459d6a28c.