Merge proposals dependent on lp://staging/~yann-papouin/ocb-addons/6.1-bug-1104766-ignore-canceled-moves

1. 6.1-bug-1104766-ignore-canceled-moves
2. Dependent merge proposals