integrating fix of bug #3521
fixing JSP compilation error about bug #3521