Merge proposals dependent on lp:~cjwatson/txpkgupload/drop-distro-files

lp:~cjwatson/txpkgupload/drop-distro-files has no merge proposals.