Merge proposals dependent on lp:~therp-nl/therp-backports/addons-6.1-lp754339_pricelist_on_invoice_line

1. addons-6.1-lp754339_pricelist_on_invoice_line
2. Dependent merge proposals