SAK-26583 Code review changes

git-svn-id: https://source.sakaiproject.org/svn/edu-services/branches/SAK-26583@311717 66ffb92e-73f9-0310-93c1-f5514f145a0a