LPS-46356

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-46356.

NOTE: The original pull had some other JSP changes, but since these changes were made in another pull and altered the markup a bit, I was able to modify this pull to reflect the latest updates.

Please let me know if you have any questions.  Thanks!