KCINFR-979: sponsor & rolodex for s2s
KCINFR-979: fixing test
KCINFR-979: responding to code review comments
Merge pull request #182 from leoherbie/s2s_sponsor_rolodex

S2s sponsor rolodex