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

1. bug1173086_submit_to_hexr_unset
2. Dependent merge proposals