MULE-7903: Resolve merge conflicts on UntilSuccessful flaky test