Merge remote-tracking branch 'refs/remotes/origin/dev#77981_675_contractuelst_cloud_enregistrement_de_la_notion_de_cotisation_dans_fiche_lecteur_carte_bloquee' into origin-master

Conflicts:
	tests/db/UpgradeDBTest.php
	tests/fixtures/KohaFixtures.php