Don't display an empty list element in the overview if the control panel item isn't visible.

Conflicts:
	CHANGES.txt
add missing condition
pep8, trailing whitespace
Tolerate having an IRolesPlugin.getRolesForPrincipal return None.

Manually cherry-pick 4dcd48