Merge proposals dependent on lp:~camptocamp/openobject-addons/addons-6.1-schedulers-fix-956234

1. addons-6.1-schedulers-fix-956234
2. Dependent merge proposals