SAK-25325 - various refinements

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