Merge branch 'bschubert/yaml-tidying' into 'master'

Some tidying up of our yaml API

See merge request BuildStream/buildstream!1644