SOS-1528

backport commit is in https://github.com/brianchandotcom/liferay-plugins-ee/pull/1738