Work on plone.app.contenrules in plip10359-mail-controlpanel.cfg
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0