Only force saltenv/pillarenv to be a string when not None
Only force saltenv/pillarenv to be a string when not None

This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.

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