Merge proposals dependent on lp://staging/~abreu-alexandre/webapps-core/packaging-fix

lp://staging/~abreu-alexandre/webapps-core/packaging-fix has no merge proposals.