Merge proposals dependent on lp://qastaging/~abreu-alexandre/bamf/proper-webapps-detection-matching

1. proper-webapps-detection-matching
2. Dependent merge proposals