Improve setuphandlers on initial portlet creation and subsequent reinstalls