Merge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandre...