Merge pull request #343 from jrperritt/cdn-openstack-rackspace

Minor fixes to Cdn openstack rackspace