Feature - Add support for node groups in the file tree external pillar module
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Feature - Added dict merge function to merge node group and host pillar data instead of overwriting it
Merge branch 'develop' of https://github.com/saltstack/salt into feature-ext_pillar-file_tree-nodegroups
Fixed lint issue with newly added code
Merge pull request #15388 from Setsuna666/feature-ext_pillar-file_tree-nodegroups

Feature - Add support for node groups in the file tree external pillar module