Merge "Switch to the upstream OpenBSD getenv/putenv/setenv implementation."