SAK-25668 changes made according to code reviews

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