Merge branch 'coldtom/backport-MR792' into 'bst-1.2'

Backport !792 to bst-1.2

See merge request BuildStream/buildstream!1338