Merge proposals dependent on lp:charms/haproxy

lp:charms/haproxy has no merge proposals.