SERVER-8511 Disable oplog dropping test in query_oplogreplay.js
Merge remote-tracking branch 'upstream/master'