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

1. wireless_connection_backport
2. Dependent merge proposals