Cherry-pick 546b0e87 from stable-2.2 branch
requested to merge azzar1-guest/deb-guile:deb/guile-2.2/d/sid/master into deb/guile-2.2/d/sid/master
Commit 546b0e87 is required because it's causing random FTBS both in Debian and in Ubuntu. Considering that the test is not fixed also drop debian/patches/0006-gc.test-after-gc-hook-mark-unresolved-on-failure-for.patch