Merge proposals dependent on lp:~vauxoo/addons-vauxoo/addons-vauxoo-6.1-mrp_production_analytic_acc-dev_rodo

1. addons-vauxoo-6.1-mrp_production_analytic_acc-dev_rodo
2. Dependent merge proposals