Merge remote-tracking branch 'origin/master' into thread-next

diff --cc .gitlab-ci.yml
index 78f0073accaaafb2009c1a5498ef374db276f086,8666c0bdaee061c9724589990b5313b952141f21..4d9237b9f1534defa77c060025c0d6f12f393a4b
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1399,10 -1397,14 +1401,14 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
+     - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab
      - sudo ./stop
+     - "mkdir $DIR/netlab-failure"
+     - git status --porcelain > $DIR/netlab-failure.log
+     - for f in $(git status --porcelain | sed -rn 's#^.[^DRT] netlab/##p'); do mkdir -p $DIR/netlab-failure/$(dirname $f); sudo chmod a+rw $f; sudo mv $f $DIR/netlab-failure/$(dirname $f); done
    artifacts:
      when: on_failure
      untracked: true

diff --cc doc/bird.sgml
Simple merge

diff --cc misc/gitlab/template.yml.j2
index 7c0cd58eb92b7c5a14c847c08a0ec001ef61a885,743c442d16fda7f7033465d35c7a60ea3956fb44..4ef0644aa78feb24f7f0628421d49a150f057d54
--- 1/misc/gitlab/template.yml.j2
--- 2/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -432,10 -434,14 +434,14 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
+     - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab
      - sudo ./stop
+     - "mkdir $DIR/netlab-failure"
+     - git status --porcelain > $DIR/netlab-failure.log
+     - for f in $(git status --porcelain | sed -rn 's#^.[^DRT] netlab/##p'); do mkdir -p $DIR/netlab-failure/$(dirname $f); sudo chmod a+rw $f; sudo mv $f $DIR/netlab-failure/$(dirname $f); done
    artifacts:
      when: on_failure
      untracked: true

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