Merge proposals dependent on lp:~camptocamp/ocb-server/ocb-7.0-no-sql-constraint-abstract-model-1151703

1. ocb-7.0-no-sql-constraint-abstract-model-1151703
2. Dependent merge proposals