TEIID-3160 ensuring that function resolving won't narrow inappropriately
Conflicts:
	engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java