Merge proposals dependent on lp://qastaging/~cjwatson/charm-haproxy/listener-address-localhost

1. listener-address-localhost
2. Dependent merge proposals