LPS-51033

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-51033.

NOTE: Iliyan wanted to just fix this in ee-6.2.x, but we cannot doa backport unless the issue is fixed on master first.  He mentioned we are changing our implementation in master (https://issues.liferay.com/browse/LPS-51033?focusedCommentId=531018&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-531018).

For now, this issue can be resolved with this pull request and backported to ee-6.2.x.  When Iliyan decides how we are to proceed on master, we can change this fix.

Please let me know if you have any questions.  Thanks!

@SamZiemer  @hhuijser