Merge proposals dependent on lp://staging/~hirt/ocb-addons/6.1-ocb_incoming-shipments_remove-company-address-restriction

1. 6.1-ocb_incoming-shipments_remove-company-address-restriction
2. Dependent merge proposals