LPS-38483 Recommit

Hey Brian,

This is a recommit of a pull that was rollbacked because there was a JSP that was too long and didn't compile in some AppServers.

We converted a JSPF file to a JSP to solve the issue.

Thanks!