Merge proposals dependent on lp:smoketest

lp:smoketest has no merge proposals.