Some more `saltenv` related changes/fixes

Still need to fix the failing tests in https://travis-ci.org/s0undt3ch/salt/jobs/13794161

So, either wait or merge and I'll resubmit another PR.