Merge proposals dependent on lp://staging/~sebastien.beau/magentoerpconnect/magentoerpconnect-oerp6.1-stable-fix-discount-computation

1. magentoerpconnect-oerp6.1-stable-fix-discount-computation
2. Dependent merge proposals