Issue #3566840: Standardize service IDs

JD Leonardrequested to merge
issue/crm-3566840:3566840-standardize-service-ids into 1.0.x

Closes #3566840

Merge request reports