KRACOEUS-7120: more service refactoring for s2s
KRACOEUS-7120: moving s2s BOs into propdev
Merge pull request #133 from leoherbie/s2s_dependency_refactor4

KRACOEUS-7120: more service refactoring for s2s