LPS-51656

Equivalent to https://github.com/SamZiemer/liferay-portal/pull/2 without the groupsOrgs changes. Will include that commit as part of a separate fix.