Merge remote-tracking branch 'origin/bugfix/10494-retry-htpdate' into bugfix/10494-retry-htpdate-with-more-fragile-tests