Merge from head (better handling of non-clang building of picobsd)
Merge from head: sync the netmap code with the one in HEAD
MFH r257801:
  - Update release noted to DocBook 5.0 so that they work with the new tree
Merge remote-tracking branch 'upstream/stable/9' into stable/9
Merge branch 'stable/9' into stable-9-atf