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

1. bluetooth_obex_whitelist
2. Dependent merge proposals