Merge proposals dependent on lp://staging/~numerigraphe-team/ocb-addons/7.0-stock-picking-copy-keep-prodlots

1. 7.0-stock-picking-copy-keep-prodlots
2. Dependent merge proposals