Merge proposals dependent on lp://qastaging/~raharper/charms/precise/swift-proxy/add-proxy-node-timeout

lp://qastaging/~raharper/charms/precise/swift-proxy/add-proxy-node-timeout has no merge proposals.