Further cleanup of the container CDN functions for openstack storage
Merge branch 'openstackSwift' into 0.9.0