[Bug 922971] Make sure retry number is finite and can be aborted [r=ranbena]
Merge pull request #12605 from EverythingMe/922971-api-retries

[Bug 922971] Make sure retry number is finite and can be aborted [r=ranbena]