Merge "rename index for OSS cis-openstack"