Merge proposals dependent on lp://staging/~brendan-donegan/checkbox-certification/fix_server-cert_whitelist

1. fix_server-cert_whitelist
2. Dependent merge proposals