Merge remote-tracking branch 'origin/master' into mq-merge-master

diff --cc .gitlab-ci.yml
index d7fa2021bd53f54e875d2a992c04ca11f549dd65,df06e06087364d575c5c2edd897f7a15cf8065f1..84b9342a29a232487c4b894aab4f3607ae3fd94d
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1124,8 -1120,9 +1124,9 @@@ 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:
+     - cd $TOOLS_DIR/netlab
      - sudo ./stop
    artifacts:
      when: on_failure

diff --cc misc/gitlab/data.yml.j2
Simple merge

diff --cc misc/gitlab/template.yml.j2
index ed534c390ca42e7f17ddef5bf00ff8ced9b0ca77,046be964fc1c66adef3baef01c2083ce57da9660..2c2ebefc667527847d8b51a6414353b4b5ddfccc
--- 1/misc/gitlab/template.yml.j2
--- 2/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -390,8 -390,9 +390,9 @@@ 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:
+     - cd $TOOLS_DIR/netlab
      - sudo ./stop
    artifacts:
      when: on_failure