Conflicts:
	interface/web/sites/lib/lang/de_web_folder.lng
	interface/web/sites/lib/lang/de_web_folder_user.lng
	interface/web/sites/lib/lang/de_web_vhost_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	server/lib/classes/db_mysql.inc.php

- Make sure the correct sys_groupid is saved for web folders and web folder users.

Fixed: FS#3350 - [Dovecot] Warning: mysql: Query failed, retrying: Unknown column 'filter' in 'where clause'

Master

This reverts commit b125fabc.

This reverts commit bc1e70a3.

This reverts commit 85851254.

This reverts commit 366decb5.

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/plugins-available/cron_plugin.inc.php