Merge proposals dependent on lp://staging/~fnordahl/charm-helpers/haproxy-logging

lp://staging/~fnordahl/charm-helpers/haproxy-logging has no merge proposals.