Merge proposals dependent on lp://staging/~akretion-team/magentoerpconnect/magentoerpconnect-fix-shipping-amount-if-discount

1. magentoerpconnect-fix-shipping-amount-if-discount
2. Dependent merge proposals