Resolved differences from svn merge to trunk and git master

install/autoupdate.php

install/install.php

install/lib/installer_base.lib.php

install/sql/incremental/upd_0049.sql

install/sql/incremental/upd_0052.sql

install/sql/incremental/upd_0055.sql

install/sql/incremental/upd_0058.sql

install/sql/ispconfig3.sql

install/tpl/amavisd_user_config.master

install/tpl/opensuse_amavisd_conf.master

install/tpl/server.ini.master

install/tpl/system.ini.master

install/update.php

interface/lib/classes/tform.inc.php

interface/lib/classes/tools_monitor.inc.php

interface/lib/lang/cz.lng

interface/lib/lang/de.lng

interface/lib/shelluser_blacklist

interface/web/admin/form/server_config.tform.php

interface/web/admin/form/system_config.tform.php