Until now we just "set" env vars during the build of BSS-2 modules ignoring the previous value. Now we modify the env vars to keep module-system-based modifications "alive".)