Merge proposals dependent on lp://staging/~yann-papouin/ocb-addons/6.1-bug-947838-sale-recreate-packing-duplicates

1. 6.1-bug-947838-sale-recreate-packing-duplicates
2. Dependent merge proposals