Merge branch 'bschubert/cleanups' into 'master' Small cleanups See merge request BuildStream/buildstream!1966