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

1. optical_whitelists_resource_update
2. Dependent merge proposals