[IMP] Add retry count

Merged Jose Luis Zanotti requested to merge T1275 into 15.0-stage

Merge request reports