Merge citrix branch into master.

diff --cc datapath/actions.c
Simple merge

diff --cc ofproto/ofproto.c
Simple merge

diff --cc vswitchd/bridge.c
Simple merge

diff --cc xenserver/etc_init.d_vswitch
Simple merge

diff --cc xenserver/etc_xensource_scripts_vif
Simple merge

diff --cc xenserver/opt_xensource_libexec_interface-reconfigure
Simple merge