SAK-11653 merge trunk r108824 and manually fix the html issue as reported in the jira

git-svn-id: https://source.sakaiproject.org/svn/mailarchive/branches/sakai-2.8.x@118557 66ffb92e-73f9-0310-93c1-f5514f145a0a