In some nested circumstances the wrong update count is returned. For example in TestHodrodExecution the update:

UPDATE G4 SET e2 = 'two-2' WHERE e2 = 'two-two' OR e2 = 'one-one'

should return 2, but instead returns 4. This happens both prior to and after the changes for TEIID-5887.