SERVER-12613 put a limit on how many indexed plans we consider, minor enum reorg
SERVER-12580 Improve mrShardedOutput.js
Merge remote-tracking branch 'upstream/master'