Added special branch '_' in git_pillar to match saltenv
Renamed special branch from '_' to '__env__'
Added special branch '_' in git_pillar to match saltenv
Renamed special branch from '_' to '__env__'
Merge branch 'develop' of github.com:keesbos/salt into develop
Merge pull request #18121 from keesbos/develop

Added special branch '_' in git_pillar to match saltenv