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

diff --cc AUTHORS
Simple merge

diff --cc NEWS
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/dpif-netdev.c
Simple merge

diff --cc lib/netdev.c
Simple merge

diff --cc lib/packets.h
Simple merge

diff --cc lib/util.h
Simple merge

diff --cc ofproto/ofproto-dpif-xlate.c
Simple merge

diff --cc ofproto/ofproto-dpif.c
Simple merge

diff --cc vswitchd/ovs-vswitchd.c
Simple merge