SAK-22918 merge 309451 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@311403 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27548 merge 310949 to 10.x

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