Merge proposals dependent on lp:~vauxoo/addons-vauxoo/addons-vauxoo-mrp_consume_produce-dev-julio

1. addons-vauxoo-mrp_consume_produce-dev-julio
2. Dependent merge proposals