Merge proposals dependent on lp://staging/~edwin-grubbs/launchpad/bug-577492-needspackaging-duplicates

1. bug-577492-needspackaging-duplicates
2. Dependent merge proposals