Fix retry of transient failures

Created by  Eelco Dolstra  on March 10, 2016
EHEQ4AY3JT6CTIANKZMMS5MZ5P5BFC7GWYN4VMSYY2FR3PW4UL7AC
In channels
upstream
main
Change contents