SERVER-16138: fix dbtest OperationContext assumption
Merge remote-tracking branch 'upstream/master'