Yes, I modified the two postfix templates as I configured dkim (see How-To: SPF, DKIM, DMARC configuration).
I don’t think I changed the clamav template.
I made a copy of my modified files and renamed the dpkg-* files to the original ones at least for the two postfix templates. Now the upgrade seems to work.