AUI-989 1.5.x backport

https://issues.liferay.com/browse/AUI-989