Support environment variable forwarding, fixes #4131

Signed-off-by: Eli Skeggs <eskeggs@globesherpa.com>