SERVER-13635: honor --storageEngine for small oplog tests
Merge remote-tracking branch 'upstream/master'