Merge proposals dependent on lp://qastaging/~chasedouglas/ginn/no-autostart

lp://qastaging/~chasedouglas/ginn/no-autostart has no merge proposals.