Merge proposals dependent on lp://qastaging/~adam-collard/charms/trusty/swift-proxy/lib-in-python-package

lp://qastaging/~adam-collard/charms/trusty/swift-proxy/lib-in-python-package has no merge proposals.