Merge "Add retry logic for lock failure when deleting a branch"