LPS-43752, LPS-48125, LPS-49177

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-43752.

Please let me know if you have any questions.  Thanks!