Merge proposals dependent on lp://staging/~therp-nl/openobject-addons/7.0_lp1266480_delivery_with_realtime-stock

1. 7.0_lp1266480_delivery_with_realtime-stock
2. Dependent merge proposals