Ensure that the decorated service will not replace tokens twice, when a...

mxhrequested to merge
issue/eca-3347155:3347155-fix-1.1-correct into 1.1.x

Ensure that the decorated service will not replace tokens twice, when a contrib or core service is given.

Closes #3347155

Merge request reports