Merge branch 'tb/t7704-deflake'

A test that fails on an unusually slow machine was found, and made less likely to cause trouble by lengthening the expiry value it uses. * tb/t7704-deflake: t/t7704-repack-cruft.sh: avoid failures during long-running tests