CB Server: fixed XDCR v1 vs. v2 issue MB-9149
Merge remote-tracking branch 'upstream/stage' into stage
CB Server: fix typos in administration section
Merge pull request #21 from amy-kurtzman/stage

Stage