SAK-22575 merge r310257 from trunk


git-svn-id: https://source.sakaiproject.org/svn/site/branches/sakai-10.x@311265 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26317 merge r310445 from trunk


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