Merge proposals dependent on lp:~jelmer/brz-builder/fixes

lp:~jelmer/brz-builder/fixes has no merge proposals.