Always give saltenv argument highest priority

I was having a problem that when passing saltenv as an argument to the salt.state state function it was being ignored. Passing env worked ok apart from generating a warning. This patch seems to make saltenv work.