add name to _retry routines
Merge branch 'topic/28_named_retry' into v1-devel