JSP Fix issue not finished
Merge pull request #2741 from dotCMS/issue-2720-encoding-problem

JSP Fix issue not finished