Complete TEIID-2700 and TEIDI-3137 to support JDG 6.3
Made changes according to TEIID-3110
Merge branch 'update_for_jdg' of https://github.com/vhalbert/teiid