SERVER-13687 fix plan enumeration for compound multikey 2d or 2dsphere indices
SERVER-13656 Use new query framework in getShardsForQuery on mongos
Merge remote-tracking branch 'upstream/master'