SAK-28064 Merge 315707,315715 from trunk

git-svn-id: https://source.sakaiproject.org/svn/msgcntr/branches/sakai-10.x@315739 66ffb92e-73f9-0310-93c1-f5514f145a0a