Merge branch 'mr889-backport' into 'develop'

Backport MR !889, unify settings between distros and improves

See merge request ispconfig/ispconfig3!1609