Merge "openstack-heat-templates: fix deprecation path"