MFC r254074: MFV r254070: Merge vendor bugfix for ZFS test suite that
triggers false positives