Merge proposals dependent on lp:~fboucault/trust-store/crossbuild_fixes

lp:~fboucault/trust-store/crossbuild_fixes has no merge proposals.