Merge "Upgrade to current NetBSD popen/pclose."