TOOLS-327 fix tests relying on --w to use --writeConcern
Merge remote-tracking branch 'upstream/master'