add p.a.portlets and p.a.vocabularies to the plip
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0

Conflicts:
	plips/plip13787-main-template.cfg