Merge proposals dependent on lp://staging/~hopem/charms/trusty/swift-proxy/fix-endpoint-leader-changed

lp://staging/~hopem/charms/trusty/swift-proxy/fix-endpoint-leader-changed has no merge proposals.