Further remove deprecation warning around WithLockRetries usage
What does this MR do?
Follow-up to !43075 (merged)
There are a couple more places for this. Plus, can we just use keyword arguments where possible (instead of the splat operator)?
Edited by Andreas Brandl