SERVER-14407 make PlanExecutor own the canonical query
SERVER-13764 update system retrieves nscanned / nscannedObjects from plan executor
Merge remote-tracking branch 'upstream/master'