Merge proposals dependent on lp://staging/~pieq/checkbox/ppa-packaging-checkbox-converged-trusty_fix-1563763

1. ppa-packaging-checkbox-converged-trusty_fix-1563763
2. Dependent merge proposals