Merge proposals dependent on lp://qastaging/~bladernr/checkbox-certification/cert-add-cert-whitelist

1. cert-add-cert-whitelist
2. Dependent merge proposals