Refs #14008 EEA; fix code warnings
Merge branch 'master' of https://github.com/collective/eea.versions