I believe this will affect master too. The fix for bug 1447194 results in the correct exceptions being raised, but I think Resource needs to fallback to TemplateResource for both TemplateNotFound and ResourceTypeNotFound:
http://git.openstack.org/cgit/openstack/heat/tree/heat/engine/resource.py#n141
I believe this will affect master too. The fix for bug 1447194 results in the correct exceptions being raised, but I think Resource needs to fallback to TemplateResource for both TemplateNotFound and ResourceTypeNot Found:
http:// git.openstack. org/cgit/ openstack/ heat/tree/ heat/engine/ resource. py#n141