Merge proposals dependent on lp:~camptocamp/margin-analysis/7.0-product_cost_incl_bom_price_history-mismatch-product-template

1. 7.0-product_cost_incl_bom_price_history-mismatch-product-template
2. Dependent merge proposals