SAK-25801 changed based on code reviews

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