Merge proposals dependent on lp://staging/~sajoupa/charm-haproxy/update-charmhelpers

lp://staging/~sajoupa/charm-haproxy/update-charmhelpers has no merge proposals.