This partially reverts commit 03b84df8.

I observed deadlocks on Linux attempting locks of user.tab on Samba share,
which also deadlocked my Windows nodes. Interestingly, the Windows nodes
never deadlocked on their own (after a week of testing) when using blocking
locks.

Double the frequency of lock retries - this has helped reduce the observed
user.tab lock failures on Vertrauen.