Move Solaris USER workaround up a bit
Move Solaris USER workaround up a bit

In its previous position, the run_env would not get the workaround when
clean_env was set to True.

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