TEIID-2528 additional changes for as config