Merge proposals dependent on lp:~julian-edwards/launchpad/cp-bug-655614-disabled-arch-indices

1. cp-bug-655614-disabled-arch-indices
2. Dependent merge proposals