Merge proposals dependent on lp://qastaging/~zyga/checkbox/ppa-packaging-plainbox-provider-resource-generic

1. ppa-packaging-plainbox-provider-resource-generic
2. Dependent merge proposals