Merge proposals dependent on lp://qastaging/~bladernr/checkbox-certification/0.12-backport-submit-script-changes-sprint

1. 0.12-backport-submit-script-changes-sprint
2. Dependent merge proposals