Add p.a.upgrade to build
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0