Fix inclusion mapping for JSP files.
Some JSP support cleanup.