Merge "lib/cinder: Strip project_id from URL"