SERVER-12330 fix assert for _id query with distinct
SERVER-11144 Fix casing in JSONPEnabled
Merge remote-tracking branch 'upstream/master'