TEIID-3136 fully resolving to ensure the metadata is correct
Conflicts:
	engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java