Merge proposals dependent on lp://staging/~vrruiz/cupstream2distro-config/add-hook-webapps-staging

1. add-hook-webapps-staging
2. Dependent merge proposals