TEIID-3017 updating type mapping
TEIID-3013 additional changes