Backported fix for OPENAM-2327 to 11.0.x
AME-2227 (See AME-2706 for CR list) Resolved servlet and JSP violations.
Fix for OPENAM-2758, internal review.
Fix for AME-202 - review: CR-802