Pillar overwrite merge stategy
Merge branch 'issue_16370' of https://github.com/cachedout/salt into cachedout-issue_16370
lint
Merge pull request #16594 from thatch45/cachedout-issue_16370

merge #16561