Merge proposals dependent on lp://staging/~jbicha/software-center/help-update-for-distutils-extra

1. help-update-for-distutils-extra
2. Dependent merge proposals