Merge changes from citrix branch into master.

diff --cc datapath/brc_sysfs.h
Simple merge

diff --cc datapath/brc_sysfs_dp.c
Simple merge

diff --cc datapath/brc_sysfs_if.c
Simple merge

diff --cc datapath/brcompat.c
Simple merge

diff --cc datapath/datapath.c
Simple merge

diff --cc datapath/datapath.h
Simple merge

diff --cc lib/socket-util.c
Simple merge

diff --cc lib/socket-util.h
Simple merge

diff --cc lib/vconn-ssl.c
Simple merge

diff --cc lib/vconn-stream.c
Simple merge

diff --cc lib/vconn-tcp.c
Simple merge

diff --cc lib/vconn-unix.c
Simple merge

diff --cc lib/vconn.c
Simple merge

diff --cc secchan/discovery.c
Simple merge

diff --cc secchan/main.c
Simple merge

diff --cc utilities/ovs-discover.c
Simple merge