For ENG-5605, remove unused arguments and add temporary debugging for system tests
ENG-5611 txnid2 fix constraint viol introduced in g407e198e0d