TEIID-3238, TEIID-3239 Fixing the CNF bug and upgrading the java driver ...

...version to latest