Merge "Fix flaky testEnableRollbackTimeoutFailsRollback test"