SAK-25926 merge 307399 307428 308500 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@308856 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25947 merge 307443 307480 to 10.x

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