SAK-23122 merge 313714, 313739 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@315302 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27806 merge 314099 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@315303 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27839 merge 313710 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-10.x@315304 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26610 merge 311236 from trunk

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