SAK-26210 merge 310184 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-10.x@310200 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21180 merge 310186 to 10.x

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