SAK-26594 merge 310526, 310551 to 10.x

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

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

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

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

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