Do not override the Collection field and provide the widget to use
Merge branch 'mockup-issue-220' of git://github.com/plone/plone.app.widgets into mockup-issue-220

Conflicts:
	plone/app/widgets/dx_pac_bbb.py