Merge proposals dependent on lp://staging/~cjwatson/launchpad/improve-dpkg-architecture-cache

1. improve-dpkg-architecture-cache
2. Dependent merge proposals