[9.0] Uniform main and backport code (#127766)#127800

elasticsearchmachine merged 1 commit intoelastic:9.0elastic/elasticsearch:9.0from

ldematte:backport/9.0/pr-127766ldematte/elasticsearch:backport/9.0/pr-127766Copy head branch name to clipboard