Merge branch 'modAndTest' of https://gitlab.com/knownexus/buildstream into modAndTest