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

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

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