Changes to avuid wrong escaping in " ' " characters. Some were missed in the first commit SAK-22956.

git-svn-id: https://source.sakaiproject.org/svn/user/trunk@121514 66ffb92e-73f9-0310-93c1-f5514f145a0a