SAK-23213 merge 310486 to 10.x

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

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