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

1. addons-vauxoo-6.1_report_process_withot_uom_dev_luis
2. Dependent merge proposals