CB Server: fixed XDCR v1 vs. v2 issue MB-9149