Merge #2692: Use pam_env to properly setup system-wide env