Merge branch '6565-configure_dovecot()' into 'develop'

configure_dovecot() in installer is creating master.cf~2

Closes #6565

See merge request !1795