[TECHNICAL-SUPPORT] LPS-46895

https://issues.liferay.com/browse/LPS-48695

Hi Brian,

I'm forwarding this pull to you with Eudaldo's permission (https://github.com/lipusz/liferay-portal/pull/34#issue-38708672).
Passed manual testing.

Regards,
Tibor

/CC-ing @ealonso