Teiid-2720 support JDG 6.2
Merge branch 'teiid2720' of https://github.com/vhalbert/teiid into 8.4.x