Merge "CORD-3128 update openstack-instance-tosca.yaml for base-openstack profile"