Merge proposals dependent on lp://qastaging/~billy-olsen/charms/trusty/swift-proxy/lp1500635

lp://qastaging/~billy-olsen/charms/trusty/swift-proxy/lp1500635 has no merge proposals.