Merge proposals dependent on lp:~james-page/charm-helpers/fix-ssl-certs

lp:~james-page/charm-helpers/fix-ssl-certs has no merge proposals.