Merge commit 'origin/citrix'

diff --combined vswitchd/ovs-vswitchd.c
index 84c373f,8c87fea..e95ee0a
--- 1/vswitchd/ovs-vswitchd.c
--- 2/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@@ -93,7 -93,9 +93,9 @@@ main(int argc, char *argv[]
              vlog_reopen_log_file();
              reconfigure();
          }
-         mgmt_run();
+         if (mgmt_run()) {
+             need_reconfigure = true;
+         }
          if (bridge_run()) {
              need_reconfigure = true;
          }
@@@ -228,7 -230,7 +230,7 @@@ parse_options(int argc, char *argv[]
  static void
  usage(void)
  {
 -    printf("%s: virtual switch daemon\n"
 +    printf("%s: Open vSwitch daemon\n"
             "usage: %s [OPTIONS] CONFIG\n"
             "CONFIG is a configuration file in ovs-vswitchd.conf(5) format.\n",
             program_name, program_name);

diff --combined xenserver/vswitch-xen.spec
index 05f9be9,d95d616..e660027
--- 1/xenserver/vswitch-xen.spec
--- 2/xenserver/vswitch-xen.spec
+++ b/xenserver/vswitch-xen.spec
@@@ -67,7 -67,7 +67,7 @@@ install -m 755 xenserver/etc_xensource_
               $RPM_BUILD_ROOT%{_prefix}/scripts/vif
  install -m 755 xenserver/root_vswitch_scripts_dump-vif-details \
                 $RPM_BUILD_ROOT%{_prefix}/scripts/dump-vif-details
- install -m 755 \
+ install -m 644 \
          xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
                 $RPM_BUILD_ROOT%{_prefix}/scripts/XSFeatureVSwitch.py
  
@@@ -84,7 -84,6 +84,7 @@@ rm -rf 
      $RPM_BUILD_ROOT/root/vswitch/bin/ovs-switchui \
      $RPM_BUILD_ROOT/root/vswitch/bin/ovs-wdt \
      $RPM_BUILD_ROOT/root/vswitch/bin/secchan \
 +    $RPM_BUILD_ROOT/root/vswitch/kernel_modules/veth_mod.ko \
      $RPM_BUILD_ROOT/root/vswitch/sbin/ovs-monitor \
      $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-controller.8 \
      $RPM_BUILD_ROOT/root/vswitch/share/man/man8/ovs-discover.8 \
@@@ -288,6 -287,7 +288,6 @@@ f
  /etc/profile.d/vswitch.sh
  /root/vswitch/kernel_modules/brcompat_mod.ko
  /root/vswitch/kernel_modules/openvswitch_mod.ko
 -/root/vswitch/kernel_modules/veth_mod.ko
  /root/vswitch/scripts/dump-vif-details
  /root/vswitch/scripts/interface-reconfigure
  /root/vswitch/scripts/vif