SAK-26098 a few additional changes from Jose Rabal


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