TEIID-2634 removing the assertion checks from constant
Merge branch '8.4.x' of https://github.com/teiid/teiid