Merge proposals dependent on lp://qastaging/~checkbox-dev/checkbox/ppa-packaging-checkbox-converged-trusty

1. ppa-packaging-checkbox-converged-trusty
2. Dependent merge proposals