SITE-753: Updated client/server source for Federation..
Merge pull request #10 from svalluripalli/SITE-753

SITE-753: Updated client/server source for Federation..