LPS-43587

Hey @drewbrokke,

There are some issue with this update as @rotty3000 pointed out at https://github.com/rotty3000/liferay-portal/pull/472 for https://issues.liferay.com/browse/LPS-43587.

Can you please update these issues and add some tests and resend me a new pull request?

Please let me know if you have any questions.  Thanks!