Merge commit 'origin/citrix'

Conflicts:

	configure.ac

diff --cc debian/openvswitch-switch-config.templates
Simple merge

diff --cc debian/openvswitch-switch.init
Simple merge

diff --cc debian/openvswitch-switch.template
Simple merge

diff --cc debian/po/templates.pot
Simple merge

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

diff --cc lib/vconn.c
Simple merge

diff --cc utilities/ovs-controller.8.in
Simple merge

diff --cc utilities/ovs-ofctl.8.in
Simple merge

diff --cc utilities/ovs-openflowd.8.in
Simple merge

diff --cc vswitchd/bridge.c
Simple merge

diff --cc vswitchd/ovs-vswitchd.conf.5.in
Simple merge