SERVER-15998 don't fall-through on WriteConflictExceptions in write command update
Merge remote-tracking branch 'upstream/master'