TEIID-3112 TEIID-3113 fix for salesforce issues and converting to real
metadata