Merge remote-tracking branch 'origin/master' into ovn

Conflicts:
	tutorial/ovs-sandbox

diff --cc Makefile.am
Simple merge

diff --cc lib/meta-flow.h
Simple merge

diff --cc tutorial/ovs-sandbox
index 9e8ead0,251f021..133585e
--- 1/tutorial/ovs-sandbox
--- 2/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@@ -268,17 -232,12 +268,20 @@@ trap 'kill `cat "$sandbox"/*.pid`' 0 1 
  # Create database and start ovsdb-server.
  touch "$sandbox"/.conf.db.~lock~
  run ovsdb-tool create conf.db "$schema"
 +ovsdb_server_args=
 +if $ovn; then
 +    touch "$sandbox"/.ovnsb.db.~lock~
 +    touch "$sandbox"/.ovnnb.db.~lock~
 +    run ovsdb-tool create ovnsb.db "$ovnsb_schema"
 +    run ovsdb-tool create ovnnb.db "$ovnnb_schema"
 +    ovsdb_server_args="ovnsb.db ovnnb.db conf.db"
 +fi
  rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \
 -    --remote=punix:"$sandbox"/db.sock
 +    --remote=punix:"$sandbox"/db.sock $ovsdb_server_args
  
+ # Initialize database.
+ run ovs-vsctl --no-wait -- init
+ 
  # Start ovs-vswitchd.
  rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
      --enable-dummy=override -vvconn -vnetdev_dummy