Merge "Decouple swift-proxy from ceilometer"