Merge proposals dependent on lp:~vorlon/ubuntu-archive-tools/autopkgtest-retry-order-by-package-not-arch

1. autopkgtest-retry-order-by-package-not-arch
2. Dependent merge proposals