Lps 49932

merged onto the wrong branch https://github.com/liferay/liferay-portal/pull/620