TRQ-1613. Prevent environment variables from leaking due to incorrectly modifying the environment.
Merge https://github.com/actorquedeveloper/torque