[9.1] Fix backwards failures for subobject auto (#130937)#130985

elasticsearchmachine merged 2 commits intoelastic:9.1elastic/elasticsearch:9.1from

kkrik-es:backport/9.1/pr-130937kkrik-es/elasticsearch:backport/9.1/pr-130937Copy head branch name to clipboard