Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#35088_oai_import_in_cosmogramme

Conflicts:
	cosmogramme/php/classes/classe_notice_integration.php
	cosmogramme/sql/patch/patch_293.php
	tests/db/UpgradeDBTest.php