Merge proposals dependent on lp:~gnuoy/charm-helpers/add-peer_ips

lp:~gnuoy/charm-helpers/add-peer_ips has no merge proposals.