Merge proposals dependent on lp://staging/~pieq/checkbox/ppa-packaging-plainbox-provider-sru-fix-1629838

1. ppa-packaging-plainbox-provider-sru-fix-1629838
2. Dependent merge proposals