LPS-42073 portlet preferences handling during import

The original fix caused a regression, this is a partial revert, still applying the bug fix for this issue.