Merge proposals dependent on lp://staging/~gz/juju-core/1.16_ssl_verification_bootstrap_state_1268913

1. 1.16_ssl_verification_bootstrap_state_1268913
2. Dependent merge proposals