Merge "rename openstack to components"