SAK-26341 merge 311242 to 10.x

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

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