Merge "Fix transaction warnings on test cleanup rollback()"