Fix looking up pillar data when merging is set to "none" and no saltenv was passed
Fix looking up pillar data when merging is set to "none" and no saltenv was passed

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt