SAK-27513 merge 310921 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/announcement/branches/sakai-10.x@311368 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22763 merge 311244 to 10.x

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