SERVER-12804: only 'report' dbhash failure on failure
Merge remote-tracking branch 'upstream/master'