SAK-25781 merge r306717 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/osp/branches/sakai-10.x@307318 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25768 merge r306236 to 10.x

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