This merge request fixes up some issues I had when trying to convert some Baserock definitions to BuildStream.