properly reset auto-retry counter (bnc#906549)
changes 1.6.317