[MERGE] sync with latest trunk
[IMP] remove read access to outgoing mail server configuration
forward port of rev 4349 in 6.1
[IMP] remove read access to outgoing mail server configuration
forward port of rev 4349 in 6.1