Added two settings that we may need to use to fix the problem with the set headers from haproxy missing randomly
added isSSL env as a helper for sogo's webmail config
Moved back zentyal-sogo.conf file to apache's sites folders and improved the http/https detection code
zentyal-sogo is enabled as a site not as a module
Merge branch 'master' into cperello/haproxy-tuning
Merge branch 'master' into cperello/more-sogo-webmail-fixes

Conflicts:
	main/sogo/extra/zentyal-sogo.conf
	main/webserver/ChangeLog
	main/webserver/stubs/default-ssl.mas
	main/webserver/stubs/vhostHttps.mas
Removed unneed variable
Merge branch 'cperello/haproxy-tuning' into cperello/more-sogo-webmail-fixes
Removed haproxy changes and leave a comment just in case we require it later
Removed the ssl mod check for ssl vhosts given that we don't use that module at all. Set HTTPS env variable to 'On' always for SSL vhosts
Added support to https access (WIP)
added doc
Merge pull request #1198 from Zentyal/jag/mail-enable-with-users

Setup mail account on enable for users that already have mail attribute
Added missing uses, fixed some erros and removed headers that break the redirects
Merge branch 'master' into cperello/more-sogo-webmail-fixes

Conflicts:
	main/webserver/ChangeLog
Merge pull request #1183 from Zentyal/ejhernandez/fix-warn-on-change-id

Fix warn on change
Merge branch 'master' into cperello/more-sogo-webmail-fixes

Conflicts:
	main/webserver/ChangeLog
Force webmail configuration regeneration after the migration and restart webserver with each config update to apply those changes
Fixed bug in LDAP synchronization of mail virtual domains
Merge pull request #1216 from Zentyal/jag/mail-vdomains-sync

Fixed bug in LDAP synchronization of mail virtual domains