Merge proposals dependent on lp://qastaging/~bladernr/checkbox-certification/checkbox-certification-cloud

1. checkbox-certification-cloud
2. Dependent merge proposals