Merge proposals dependent on lp://staging/~rockstar/launchpad/fix-code-windmill-tests

lp://staging/~rockstar/launchpad/fix-code-windmill-tests has no merge proposals.