Merge branch 'cs/subtree-reftable-testfix'

Test fix (in contrib/) * cs/subtree-reftable-testfix: contrib/subtree: fix tests with reftable backend