Merge commit 'e29f134a' into thread-merge-2.16

diff --cc doc/bird.sgml
Simple merge

diff --cc nest/bfd.h
Simple merge

diff --cc nest/config.Y
index 2da68b337d1cb6151ecdc0ab6b4c8934a4d56f12,6b89f5d853c5b41e013a7ae3af30c9fd72143217..3dc28dd7e795f545d2226e3929de6667dc71064d
--- 1/nest/config.Y
--- 2/nest/config.Y
+++ b/nest/config.Y
@@@ -159,12 -121,11 +159,11 @@@ CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIV
  CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512)
  CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
  CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION)
 -CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
 +CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP, PARTIAL)
  CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
  CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
- CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
  CF_KEYWORDS(CHECK, LINK)
 -CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD)
 +CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, ROA, DIGEST, ROUTE, REFRESH, SETTLE, TIME, GC, THRESHOLD, PERIOD)
  CF_KEYWORDS(MPLS_LABEL, MPLS_POLICY, MPLS_CLASS)
  CF_KEYWORDS(ASPA_PROVIDERS)
  

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/bfd/packets.c
Simple merge