SERVER-15495 move query_stage_count to query_stage_count_scan
SERVER-15495 add tests for query_stage_count
SERVER-15847 Make sure producer thread wakes up and terminates when we're shutting down
Merge remote-tracking branch 'upstream/master'