UP-4064:  Re-apply portlet type as permission target with fix for initportal issue