Fixes an oversight in the new modules.pillar.get merge parameter that failed to provide adefault when no value was available.
Fixes lint error, too many newlines.
Merge pull request #12553 from cheuschober/fix_pillar_get_merge_when_missing

Fixes an oversight in the new modules.pillar.get merge parameter