SERVER-12072 Don't swallow 'norepl' errors in the shell now that they no longer happen with default write concern
Merge remote-tracking branch 'upstream/master'