test fix
Merge remote-tracking branch 'origin/master' into remove-dt-dl-dd

Conflicts:
	plone/portlet/collection/tests/functional.txt