6.1.x portlet prefs

These backported changes are ready for upstream/6.1.x. Thanks.