Merge proposals dependent on lp://staging/~gary-lasker/software-center/staging-certs-2-for-5.0

1. staging-certs-2-for-5.0
2. Dependent merge proposals