Retry on deadlock to prevent alert noise

@kbarrette - See https://trello.com/c/3QOCqzP9