SAK-26101 merge 308219 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@308660 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25958 merge 307477 308023 to 10.x

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