SAK-25514 - more format changes to make velocity templates readable

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