LPS-47016 and LPS-47018

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