VIVO-604 getting rid of ExternalIdRetryController
Merge branch 'maint-rel-1.6' into develop