Merge "NewContextFromEnv should set the env variables.."