SERVER-13773 rollback cleanup in preparation for more testing
SERVER-10464 allow mongodump to dump oplog without a query containing a ts field
Merge remote-tracking branch 'upstream/master'