Merge change 4515 into donut

* changes:
  Tell DBUS not to call _exit() if the DBUS connection disconnects.