Merge branch 'tristan/misc-cleanup' into 'master'

Misc cleanups

See merge request BuildStream/buildstream!993