Merge "Remove openstack-common.conf"