SERVER-12596 writeConcern {} and writeConcern {wtimeout: 1000} treated like {w: 0}
SERVER-12664 Change nUpdated to nMatched in bulk api results
Merge remote-tracking branch 'upstream/master'