Options Ordering: restore ENV

I haven't been able to confirm that it cures the shell script problems (as I can't reproduce it), but this should do.

What it does is basically restore the normal environment, with the module options PropertySource coming **first** (and it still tries to resolve \<type\>.\<module\>.\<name\> in env/systemProps when looking for ${name})