small buildbucket fixes

Merged Nick Bearson requested to merge 2022-03-18-buildbucket-tweaks into master

Merge request reports