Update CONTRIBUTING.md
Update CONTRIBUTING.md
add serial types for OpenBSD
(cherry picked from commit a439dc4)
Merge remote-tracking branch 'origin/staging' into staging