Merge branch 'cherry-pick-9ac39915' into 'develop'

Resolve "E2E Orchestrator component has wrong service name in Constants.py"

See merge request !246