Minor MockServer tweaks for CK unit tests.
Merge commit 'a6c841f3422a81bfee35e730c347627cd5264c3c' into sam/async