srun env var logic fix

This fixes the problem introduced in by commit
777a45f9 and maintains proper PMIx
operation.
bugs 4132 and 4615