Merge proposals dependent on lp://qastaging/~thisfred/desktopcouch/fix-setup

lp://qastaging/~thisfred/desktopcouch/fix-setup has no merge proposals.