Merge branch 'master' into ecmp_tests

diff --cc tests/topotests/pytest.ini
index ade5bfd5010d661252620b87db3bfe32ee14064f,b052bb7c8d3a72f2d460800dd0d7e159f20b2032..62c825341f03b6df7a938e99a08eebbb396ee9a4
--- 1/tests/topotests/pytest.ini
--- 2/tests/topotests/pytest.ini
+++ b/tests/topotests/pytest.ini
@@@ -1,6 -1,6 +1,6 @@@
  # Skip pytests example directory
  [pytest]
- norecursedirs = .git example-test example-topojson-test lib docker
 -norecursedirs = .git example-test example-topojson-test lib docker bgp-ecmp-topo2 bgp_rr_ibgp
++norecursedirs = .git example-test example-topojson-test lib docker bgp_rr_ibgp
  
  [topogen]
  # Default configuration values