TEIID-2702 using an Integer for batch size
Merge branch '8.4.x' of https://github.com/teiid/teiid into 8.4.x