SERVER-12822: use real ObjectId
Merge remote-tracking branch 'upstream/master'