Merge branch 'tristan/bst-1/misc-cleanup' into 'bst-1'

Backport some misc fixes (bst-1)

See merge request BuildStream/buildstream!1517