Merge branch 'mq-aggregator-for-v3' into thread-next

diff --cc doc/bird.sgml
Simple merge

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

diff --cc proto/bgp/config.Y
index b0a2df33712c0707e5e6fc8daba95891be17832d,f589fd8402542fba556fc1caec6f2eb9192acf4b..cdfb3cf03319805b7e8d8aba07ff46fe8d53e9a5
--- 1/proto/bgp/config.Y
--- 2/proto/bgp/config.Y
+++ b/proto/bgp/config.Y
@@@ -19,12 -19,13 +19,12 @@@ CF_DECL
  
  CF_KEYWORDS(BGP, LOCAL, NEIGHBOR, AS, HOLD, TIME, CONNECT, RETRY, KEEPALIVE,
        MULTIHOP, STARTUP, VIA, NEXT, HOP, SELF, DEFAULT, PATH, METRIC, ERROR,
 -      START, DELAY, FORGET, WAIT, ENABLE, DISABLE, AFTER, BGP_PATH,
 -      BGP_LOCAL_PREF, BGP_MED, BGP_ORIGIN, BGP_NEXT_HOP, BGP_ATOMIC_AGGR,
 -      BGP_AGGREGATOR, BGP_COMMUNITY, BGP_EXT_COMMUNITY, BGP_LARGE_COMMUNITY,
 +      START, DELAY, FORGET, WAIT, ENABLE, DISABLE, AFTER,
 +      BGP_LOCAL_PREF, BGP_MED, 
        SOURCE, ADDRESS, PASSWORD, RR, RS, CLIENT, CLUSTER, ID, AS4, ADVERTISE,
        IPV4, CAPABILITIES, LIMIT, PASSIVE, PREFER, OLDER, MISSING, LLADDR,
-       DROP, IGNORE, ROUTE, REFRESH, INTERPRET, COMMUNITIES,
 -      DROP, IGNORE, ENHANCED, ROUTE, REFRESH, INTERPRET, COMMUNITIES, BGP_ORIGINATOR_ID,
 -      BGP_CLUSTER_LIST, IGP, TABLE, GATEWAY, DIRECT, RECURSIVE, MED, TTL,
++      DROP, IGNORE, ENHANCED, ROUTE, REFRESH, INTERPRET, COMMUNITIES,
 +      IGP, TABLE, GATEWAY, DIRECT, RECURSIVE, MED, TTL,
        SECURITY, DETERMINISTIC, SECONDARY, ALLOW, BFD, ADD, PATHS, RX, TX,
        GRACEFUL, RESTART, AWARE, CHECK, LINK, PORT, EXTENDED, MESSAGES, SETKEY,
        STRICT, BIND, CONFEDERATION, MEMBER, MULTICAST, FLOW4, FLOW6, LONG,

diff --cc proto/bgp/packets.c
Simple merge