Always give saltenv argument highest priority
Merge pull request #9904 from mbirtwell/fix_saltenv_priority

Always give saltenv argument highest priority