csvbenchmark: fix prob with row count check when tries>1
Merge remote-tracking branch 'origin/release-3.7' into ENG-4625-change-catalog
ENG-4625 / ENG-5291 beef up tests that missed these issues.