Merge commit '26dd61ee7f91c15157601b2404de5b6500a6061c' into thread-next

diff --cc conf/confbase.Y
Simple merge

diff --cc doc/bird.sgml
Simple merge

diff --cc proto/bfd/bfd.c
Simple merge

diff --cc proto/bfd/bfd.h
Simple merge

diff --cc proto/bfd/config.Y
Simple merge

diff --cc proto/rpki/config.Y
Simple merge

diff --cc proto/rpki/rpki.h
Simple merge

diff --cc proto/rpki/transport.c
Simple merge