Merge proposals dependent on lp://staging/~gtrkiller/charm-haproxy/autocert_bug_fix

lp://staging/~gtrkiller/charm-haproxy/autocert_bug_fix has no merge proposals.