[9.1] Correctly handling data stream settings when component templates are used (#130394)#130406

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

masseyke:backport/9.1/pr-130394masseyke/elasticsearch:backport/9.1/pr-130394Copy head branch name to clipboard