Merge branch 'master' into origin-dev#86039_pairing_contractuel_bdp89_specs_pret_malle

Conflicts:
	cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
	cosmogramme/php/fonctions/objets_saisie.php
	cosmogramme/sql/patch/patch_377.php
	tests/db/UpgradeDBTest.php