Intent to backport OAK-6637

[Chetan Mehrotra]

I would like to backport OAK-6637 which improves the resilience of
locking and ensures any exception should not cause the lock to be lost
preventing further index updates

Chetan Mehrotra