Merge "Retry more aggressively if merger can't fetch refs"