Various fixes, refs #14827
Merge branch 'master' of github.com:eea/eea.plonebuildout.example