SAK-16600 formatting changes only

git-svn-id: https://source.sakaiproject.org/svn/site-manage/trunk@122316 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-16600 code cleanup, fix NPE, fix some navigation

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