INFRASYS-2928 Add re-tries to avoid deployment failures 

- Neil's fix
- sync dandb's repo with changes from Anttix