Merge proposals dependent on lp://qastaging/~zyga/checkbox/fix-1307980-plainbox-provider-checkbox

1. fix-1307980-plainbox-provider-checkbox
2. Dependent merge proposals