SAK-25455 address some issues with last patch

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