Merge proposals dependent on lp://staging/~wgrant/launchpad/no-publishing-component-override

1. no-publishing-component-override
2. Dependent merge proposals