Merge branch 'master' into 'master'

postfix plugins should not corrupt "other" settings + fix

postfix plugins should not corrupt "other" settings - sysadmin, ...
fixes some misconfiguration under certain circonstances

See merge request !191