SERVER-15659 make MockStage return actual mock stats
Merge remote-tracking branch 'upstream/master'