Merge proposals dependent on lp://staging/~sajoupa/charm-haproxy/latest-charm-helpers-fix-tests

1. latest-charm-helpers-fix-tests
2. Dependent merge proposals