CXX-77 Backport relevant server repo changes applied between rc0 and rc1
Merge pull request #16 from acmorrow/CXX-77

CXX-77 Backport relevant server repo changes applied between rc0 and rc1