MULE-6926 Attempt to improve UntilSuccessfulTestCase and avoid flakiness