LPS-48470, LPS-48823, LPS-48813, LPS-49474, LPS-48047

Hey @brianchandotcom,

Attached is an update for http://issues.liferay.com/browse/LPS-48470, https://issues.liferay.com/browse/LPS-48823, https://issues.liferay.com/browse/LPS-48813, https://issues.liferay.com/browse/LPS-49474, https://issues.liferay.com/browse/LPS-48047.

Please let me know if you have any questions.  Thanks!