Merge proposals dependent on lp://staging/~camptocamp/openupgrade-tools/7.0-add-database_cleanup-purge-model-attachment-error2

1. 7.0-add-database_cleanup-purge-model-attachment-error2
2. Dependent merge proposals