Service remapping support
Merge pull request #39 from robotics-in-concert/opp

Service remapping support