Merge proposals dependent on lp://qastaging/~gtrkiller/charm-haproxy/update_port_fix

lp://qastaging/~gtrkiller/charm-haproxy/update_port_fix has no merge proposals.