Merge "CORD-3045 Reoganize TOSCA for base-openstack profile"