SAAS-501: Re-jig cloud_storage.conf