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

lp://staging/~brendan-donegan/checkbox-certification/server-soc has no merge proposals.