Merge branch 'ab/test-cleanly-recreate-trash-directory'

Improve test framework around unwritable directories. * ab/test-cleanly-recreate-trash-directory: test-lib.sh: try to re-chmod & retry on failed trash removal