SAK-25556 - Merge 316143 and 316151 from trunk


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