Issue 2 - Fixes for plone.app.portlets 2.5a1