Refs #16751; add missing imports
Merge branch 'master' of https://github.com/collective/eea.versions
Refs #16751; fix evolve script