SAK-25514 - final formatting changes, parsing errors corrected

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-25514@133243 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25514 - update from trunk

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/SAK-25514@133245 66ffb92e-73f9-0310-93c1-f5514f145a0a