Merge proposals dependent on lp://qastaging/~tribaal/landscape-client/better-self-signed-cert-ux

1. better-self-signed-cert-ux
2. Dependent merge proposals