Add support for retry on NodeLocked exceptions

An attempt to help mitigate the problem errors due to a node being
locked by multiple threads.

Change-Id: Ib37e6a86650698bc763281ddafbab65bf80d2bdc
Merge "Add support for retry on NodeLocked exceptions"