SAK-23032 merge 310245 to 10.x

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

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