Merge proposals dependent on lp://staging/~cprov/launchpad/bug-424797-buildd-manager-test-failure

1. bug-424797-buildd-manager-test-failure
2. Dependent merge proposals