Merge branch 'MDL-69513-dkim-settings' of https://github.com/brendanheywood/moodle