Issue #3269293 by mfb: Refactor config due to circular reference detected for service

mark burdettrequested to merge
issue/raven-3269293:3269293-circular-reference-detected into 7.x

Closes #3269293

Merge request reports