Prior to this patch, the retry/until logic would fail any task that succeeded if it took all of the alloted retries to succeed. This patch reworks the retry/until logic to make things more simple and clear. Fixes #15697
30a38f9