Work on 10359-mail-controlpanel branch of plone.app.upgrade
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0