SERVER-9469 proper optime BSON type in batch result
Merge remote-tracking branch 'upstream/master'