SERVER-13616 "type 7" (OID) error when acquiring distributed lock for first time
(cherry picked from commit 6254a575a99d9eeda90b0712efd4486411591212)
SERVER-13687 fix plan enumeration for compound multikey 2d or 2dsphere indices