KCINFR-979: repackaging some incorrect apis, repackaging s2s to denote the api versus the impl
KCINFR-979: code review comments
Merge pull request #407 from leoherbie/s2s_repackage

KCINFR-979: repackaging some incorrect apis, repackaging s2s to denote t...