Merge "cloud config migration from openstack to catdb"