p.a.controlpanel now has a test extra;
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0