brianchandotcom/liferay-portal — pull request #15357 by matethurzo (2013-11-14 21:04:55+00:00)
Title: 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.