LPS-48702, LPS-48698, LPS-48702

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