LPS-40268

Separate pull request for 6.1.x at https://github.com/brianchandotcom/liferay-plugins-ee/pull/3261