Merge proposals dependent on lp://qastaging/~cmiller/desktopcouch/defer-dbus-until-after-plugins

1. defer-dbus-until-after-plugins
2. Dependent merge proposals