Merge remote-tracking branch...

Merge remote-tracking branch 'refs/remotes/origin/dev#118579_contractuel_minsoc_definition_de_domaines_pouvoir_definir_l_operateur_etou_entre_un_critere_et_les_autres_pour_l_onglet_autorites_etape_2'

# Conflicts:
#	cosmogramme/sql/patch/patch_396.php
#	library/ZendAfi/Form/Configuration/Domain.php
#	tests/application/modules/admin/controllers/CatalogueControllerTest.php
#	tests/db/UpgradeDBTest.php