Merge branch 'ipv6'

only one minor conflict found in a comment in Makefile

diff --cc Makefile
index 824138e,2a073d3..5221fa8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -135,7 -135,7 +135,7 @@@ NODEURL:=root@$(NODE):
  endif
  
  # this is for lxc only, we need to exclude the vs stuff that otherwise messes up everything on node
- # xxx keep this in sync with setup.spec
 -# keep this in sync with setup.spec
++# WARNING: keep this in sync with setup.spec
  LXC_EXCLUDES= --exclude sliver_vs.py --exclude coresched_vs.py --exclude drl.py
  
  # run with make SYNC_RESTART=false if you want to skip restarting nm