SERVER-12804:smoke.py small_oplog improvements
Merge remote-tracking branch 'upstream/master'