[TECHNICAL-SUPPORT] AUI-905 Backport for 1.0.x

Hey Nate,

I've found that this backport in combination with the portal-related changes (proposed at https://github.com/lipusz/liferay-portal-ee/commits/LPS-37875-ee-6.0.x) can solve a recent customer issue on ee-6.0.x.

Regards,
Tibor