Adds a third boolean parameter, merge, to pillar.get() for situations where the returned data (dict) should be merged with the passed default via salt.utils.dictupdate.update(). A convenience param for creating default pillar data in situations where grains.filter_by() is unnecessary because no actual grains need be filtered.
Merge remote-tracking branch 'upstream/develop' into add-pillar-get-merge
Merge remote-tracking branch 'upstream/develop' into add-pillar-get-merge
Fixes lint/whitespace issues for pillar.get() merge parameter enhancement.
Merge pull request #11395 from cheuschober/add-pillar-get-merge

Add pillar get merge