Only rescan trash folder when checking deleted versions

This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.

Backport of 97a51c46eddf4c1e8c691eea96dd762425ce17ca from master