BugId:97310 - Remove hardcoded servedBy from delivery's config