Merge proposals dependent on lp://staging/~fboucault/webapps-core/crossbuild_fixes

lp://staging/~fboucault/webapps-core/crossbuild_fixes has no merge proposals.