Merge proposals dependent on lp:~camptocamp/prestashoperpconnect/tax-included-on-shipping-line

1. tax-included-on-shipping-line
2. Dependent merge proposals