KRACOEUS-7120: more service refactoring for s2s
KRACOEUS-7120: fixing javadoc
Merge pull request #128 from leoherbie/s2s_dependency_refactor3

Sorry clicked on the wrong button . KRACOEUS-7120: more service refactoring for s2s