Add default for pillar_source_merging_strategy in conf/master file
Add default for pillar_source_merging_strategy in conf/master file

Fixes #21511

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt