Merge proposals dependent on lp://staging/~elbati/andreacometa-addons/fix-7-stock_cancel-views-elbati

1. fix-7-stock_cancel-views-elbati
2. Dependent merge proposals