Merge proposals dependent on lp://staging/~tom-gall/live-build/fix-806543

lp://staging/~tom-gall/live-build/fix-806543 has no merge proposals.