Merge branch 'ab/reftable-build-fixes'