Merge proposals dependent on lp://staging/~ocb/ocb-web/ocb-web-7.0_lp1193563_typeerror-expected_bytes

1. ocb-web-7.0_lp1193563_typeerror-expected_bytes
2. Dependent merge proposals