Merge proposals dependent on lp://qastaging/~cmiller/desktopcouch/get-port-through-dbus-again

lp://qastaging/~cmiller/desktopcouch/get-port-through-dbus-again has no merge proposals.