KCINFR-979: code review fixes
Merge pull request #226 from leoherbie/s2s-gv

S2s gv
KCINFR-979: s2s service apis for s2s objects
KCINFR-979: s2s service apis for s2s objects