Pillar overwrite merge stategy

Refs #16530 

This worked for my basic tests. Could use some review.