Flag to clean environment variables - fix

I was a little rushed with the previous commit.
https://github.com/saltstack/salt/issues/6642
Merge pull request #6663 from DDarko/develop

Flag to clean environment variables - fix