Merge proposals dependent on lp://staging/~numerigraphe/openobject-addons/6.1-stock-backorder-rewrite

1. 6.1-stock-backorder-rewrite
2. Dependent merge proposals