SAK-23032 merge 310245 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sections/branches/sakai-10.x@311362 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27545 merge 310946 to 10.x

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