Merge proposals dependent on lp://qastaging/~hudson-openstack/swift/trunk

lp://qastaging/~hudson-openstack/swift/trunk has no merge proposals.