TEIID-3111 making function resolving more consistent
TEIID-3097 broadening the check to include internal model names as well
Conflicts:
	runtime/src/main/resources/org/teiid/runtime/i18n.properties