Merge proposals dependent on lp://staging/~henninge/launchpad/bug-545365-published-uploads-ui

1. bug-545365-published-uploads-ui
2. Dependent merge proposals