LPS-51455, LPS-49225, LPS-48945, LPS-48449

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