Revert "Revert "Update Products.CMFCore to fix https://dev.plone.org/ticket/10071""
Sorry for the noise. I was trying to figure out which commit broke the build.

This reverts commit d1058f0966226bb495ae0753b13b29e5a0d7d1ac.