SOS-1568 -u brianchandotcom

ee-6.1.x backport is commited. https://github.com/brianchandotcom/liferay-plugins-ee/pull/1743