SAK-28121 Merge 315748,315754 from trunk

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