LPS-40921

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-40921 and https://issues.liferay.com/browse/LPS-46935.

Please let me know if you have any questions.  Thanks!