Rev 7026: Fix issue #75: Component specific env variables overrides existing env variables.