Merge proposals dependent on lp://staging/~brendan-donegan/checkbox-certification/simplify_plugins

1. simplify_plugins
2. Dependent merge proposals