TEIID-2766: fixig batch-size=-1 to return all the rows in the resultset. This is currently mapped to Integer.MAX_VALUE
TEIID-2757 adding an invalid character replacement option
Conflicts:

	odata/src/main/java/org/teiid/odata/EntityList.java
	odata/src/test/java/org/teiid/odata/TestODataIntegration.java