Merge proposals dependent on lp://staging/~therp-nl/ocb-addons/7.0-lp1249600-reverse_ocb_email_defaults

1. 7.0-lp1249600-reverse_ocb_email_defaults
2. Dependent merge proposals