Merge "Remove cinder v1 artifacts from code base"