SERVER-12274 bugfix always report err: null if ok: true
Merge remote-tracking branch 'upstream/master'