Merge proposals dependent on lp://qastaging/~jcsackett/launchpad/distributionsourcepackage-summary-fix

1. distributionsourcepackage-summary-fix
2. Dependent merge proposals