SERVER-14098 add CountStage
Merge remote-tracking branch 'upstream/master'