Bug #5020 - fixing portlet management problems