LPS-49486

Hey @natecavanaugh,

Attached is an update for https://issues.liferay.com/browse/LPS-49486.

NOTE: This is going to be for master and ee-6.2.x.  Changes for ee-6.1.x can be found at https://github.com/natecavanaugh/liferay-portal-ee/pull/186.

Please let me know if you have any questions.  Thanks!