Revert "Merge pull request #1121 from Zentyal/scabrero/dns-fix-error-booting"

This reverts commit 1c4f9483c43eb8c08b7ca28d229f699268a71ebd, reversing
changes made to 1b93cf2aeff0ee6e7b7fe0b1c6c13a5cc228843f.
Revert "Merge pull request #1102 from Zentyal/jacalvo/dns-gss-update"

This reverts commit d6c2f15794a440aa9e64567ed8a50e1628ee4c4b, reversing
changes made to 41d66cb38a6720b96b0050b12ff66d2271ebc39f.
Revert "Moved the sogo webmail configuration file to conf-* directories instead of the sites-* ones"

This reverts commit e1c01a62d29c21c9bde0d6cee1e94e5670d69862.
Revert "Fixed the server url to stick to https or http depending on the kind of request"

This reverts commit 41af5aa282664bbb50eb44d57624fc18d02a2224.
Set templated files encoding to UTF-8
Merge pull request #1155 from Zentyal/jacalvo/revert-dns-gss-update

Jacalvo/revert dns gss update
Merge pull request #1158 from Zentyal/scabrero/core-set-templated-filed-encoding

Set templated files encoding to UTF-8
Merge pull request #1156 from Zentyal/cperello/revert-sogo-webmail-changes

Cperello/revert sogo webmail changes
Merge branch 'master' into scabrero/fix-post-save-modules

Conflicts:
	main/core/ChangeLog